Tested and working

Needs maps updated