Initial commit
Added map and some tests
Added TODO