Testing and comments are done

Merge this with master then close this branch