Quite a bit....created a "sorter" type class hierarchy that operates on a spike data type. Also moved most of the controller code into data and cleaned up the spike pool class.