Everything but tests

Added/Changed a lot of small methods/variables. Also added the Read
test.