First commit; basic test cases working