Initial commit
Refactor use of class attributes
Finish refactor of __init__ method