tahaimt

Wow, it hasnt even been looked at and its about to be closed.

@dakahn can you please take a look at this?