Adding in more fun stuff