New style

Some initial changes. Will keep working on this, so don't merge yet.