Whoop, forgot to actually remove the Universe class. Cleaned up some
of the refactored code.