Been changing around some, need to commit now..