Day 2 - Code Version 3

Day 2 - Code Version 3
A bit of a cleanup, working progress