Initial commit for final fitting macro