Started working on public mapping

In test, so that I don't break the build due to low test coverage