Requested/WIP Mocode features