Sprint1 logic first commit