Fixes #14 with a re-factored init