Continued updates to swatter

Commit to rescue WIP swatter code from dead macbook :(