TODO list
==========

optimize, consolidate, beautify (a never ending task :-) )