Did some stuff - Fixes #5