WIP on shock code