week 4 and new style changes

Signed-off-by: David Holbrook <david@davidholbrook.info>