reorganised code actually works
divided into weeks this might work