Fixing affect stuff
slight reorg
clean up and moving a function stub
convention
Changing observer api