reorganizing to allow seperate prototypes.