Renamed some things, now the hard part (╯°□°）╯