initial start of 1.0 refactor