adds comments, adds trap

trap is still work in progress