Initial 1.0 commit - with basic tests