Feature 3 fuck yeah!

Fixes #4