Marking up a lot of TODOs to get the basics file passing. Almost done.