! likes permissions to the new function/area
Signed-off-by:Spuds <spuds@spudsdesign.com>
! merge error, missed ), during  conflict resolve
Signed-off-by:Spuds <spuds@spudsdesign.com>
! The rest of merge conflict updates

Signed-off-by: Spuds <spuds@spudsdesign.com>