Getting started towards making it look like the current version