week4 tasks

2 week4 tasks have been implemented and want some feedback. :)