Timer code added, new command added, small refactoring.