Addded basic functionality and tests
resolved conflicts