Bak to V1

Rolled back to previous development after finding some bugs