Big update!

Finally got around to doing what I needed to do :D