Beta 2.1

Redo ALL THE THINGS