Zimyx hw 5

Ready to merge, fix date..