finished part 3, needs debugging/testing
Merge branch 'master' of ssh://github.com/moritzg91/rwb