added day 2; some reorganizing