Added prototypes and holes, added escape functionality