Added challenge5 and cleaned up challenge1/2