Considering changing up our design for optimization.  Have to debug some nasty bugs as well