Restructure; stubbing out handlers