Temporary commit

About to re-do the whole style