#377 Finish up recently added dev