Add tests
Shorten certain areas of code
Create documentation