Big scope change! part 1

refs issue #5