added lots of fun stuff