major updates, initial timer framework done