Initial Commit V1

Fixing some bugs :p