Feature/issue 56

I HAVE NO IDEA WHAT I'M DOING!