Friday changes

Work in progress, don't merge yet.