Squash develop

Squashed and cleaned up a bunch of commits