Big changes to interface, started on porting over parser.