day 1 revised and some older scala stuff from last week