week 6 wip

Signed-off-by: Bartol Karuza <me@bartolkaruza.com>