Reformatting functions, going to fill in soon