Working in new branch because of testing different design