Changes to sensory input
Refactor surface classes