Major changes

See the main file for more information.