Sorta fixed it to where it was with the new model system. Still kinda
flawed conceptually, but should be pretty simple to finish now.