Getting close, still a few mistakes