Major changes

Still does nothing.