Started work on porting to WAMP