final commit of hackathon - somehow working version :)