All features for week 4 have been implemented and are working properly