More WIP
All working except RR's mock() method