Test expansions, moved kernel code into prototype. Plan on moving more into prototypes.