add comments, start building out master class