Added timer
Fixed
Finished timer
Fixed issues
Fixed conflicts
Fixed more conflicts