Your first pull request!

This code is somewhat unorganised, but that doesn't matter too much, right?