added stubs for Pabitra
unit tests passing
merged conflicts