moved some shit around.
Merge branch 'master' of https://github.com/cnduru/sw7