Cleaning up miscellaneous stuff.
Starting new approach to modelling.