Adding prism, more prototypes - lots of cleanup left to do