Revert "Started to take stuff away"

This reverts commit a770466d3a63c4e1d0345a70a412ea4dee6ccf41.
Ronnie's working version

or so he says...