finishing up comments, ready to start refactor