Redone for the most part, after thinking for a little while what to do.