mocked out builder
fixed mock
implemented the handler