Commented out a few lines that weren't compiling at the moment