Working on version control
Fixing bugs