Continued work on the new architecture; updated the Timer plugin