Now actually did the things the last commit was supposed to do