All formatting updated. Still needs function