Began to move some methods into seperate classes
Bumped version