start creating stubs for different parts
resolve merge conflicts