First commit
Cleaned up some debug stuff