added timer functionality and changed ? to @? for prefixing consistency for branching