Latest update

This is the latest version of the code, and is how it currently stands at the moment.