Fleshed out parsing

Currently not working, but have to close it down for the night.