Beekeeping

See commit log for details. Once this is merged, maplock will be released