Added some dev functionality and teting