Changes for initial push with tests

ick...