5 Working

5 is now working and 7 is close