Cleanup and actually getting stuff to work