Parser updates

Added some error handling, detecting which objects to make. Still
working on it.