Fixed all bugs! 7-9