spent the day working on peersun meteor app deadline. no open code. :-(
merge confilct resolved