Quite a few changes, probably wont merge right :/