Added design mocks and handled weird git errors