Development Tasks 2 and 3