Started work on porting the prototype over