Added structure
Added tests (jasmine)