Fixing some bugs related to speed. This version works pretty well, but I think cohesion needs a bit of work still