Naming fixes & added first Timer function