New branch with new features

Yay cool