integrated parser. changes to UI