Committing first version where basic test case works.