Everything is running now, but code has to be reviewed and refactored