nightly commit of everything. mostly got the flow of things working