Initial commit work, fixes #1