update TODO with new ideas, pull completed ones.
update headers
add stub var so something can get passed even when it isn't really needed.