initial commit for #30. Non-functional