Changes for initial push with tests

probably not prints