More stuff

Refactored and added more stuff