1st half of week 2

:sparkles: TDD :sparkles: