Added a mock and tested it, also added a bayer implementation
Merge conflict fixes