Renamed some stuff and more SQL :3