Moved some things around for better organization.