Patch 3

Further updates, I like the state of it.