Added timer functionality
Integrated all files, added timer