Large refactor with new extends and new names
Moving comment
Merge pull request #65 from shayhowe/new_extends_names

Large refactor with new extends and new names