version 2

Major project rework. Non-timing elements function mostly correctly.