Added primitive mocking to allow UI dev