progress :)
more parsing stuff
re-organize into files
document / spec out