Fixed horrible bugs, ready for merge
We are ready to go!