Added more map options, added proof of concept of locked map functionality