This is what I got done last night, still some more to go