Bug fixing this will be fun!