Get stuff working

Fixes #2