WIP changes to the parsing in and output