First set of changes

It doesn't do much at the moment, but stay tuned.