Added some more functionality, added stuff in case we have to present
tomorrow so at least it looks like it's working. Not done yet, but this
should be ok for a presentation