Work on updating.
So much refactoring >.<