Trying to make editing this easier...
Starting to get the scala code documented