Dev branch

Make sure i didn't accidentally break anything