--Initial Commit: 03-08-2015 new context-based code; no more timers (=easier debugging)