TODO need to start working on comments