First push in awhile, lot's of updates