V.15

sprint 4 logic (almost) completed