026.12 tinyg merge - started work on controller.cpp
026.13	// tinyg merge - updated assertions