WIP on trying to get the OtestBuild working

Signed-off-by: Ben Jackman <ben@jackman.biz>
Well this might work ... that was a lot of work, so going to keep my fingers crossed tomorrow morning

Signed-off-by: Ben Jackman <ben@jackman.biz>