WIP #33

Finished implementing STOP