Working on a new template

Don't mind the mess...