Updating models and stuff. Really, quite the overhaul