Sprint 6 - tasks F108 & B9