More previous functionality restored, right click enabled, but not yet completed or implemented, still need to refactor the hierarchy to properly adopt delegates rather than notification center notifications as means of message passing