Added debug stuff
Moved stuff