Beta Build

Still a lot of bugs