Proposal cleaning

not yet ready for merge, need real testing and also automatic tests. More for discussion of design.
Looks like all this initializations ended in the wrong place after code flushing (```self.run``` instead of ```initialize```)