Added a lot of back end logic items
signals working, but now going to remove a bunch of classes so just saving progress
Preliminary tests passing.  Will test further with jUnit on next push.
resolved merge conflict