Cleaned up and shortened code
Timed redo of skills1, took 20 minutes, rocky start (had to look at original skills1 to remember use of reduce/filter/map)