Lots of cleanup, figuring out object parsing