Fit pro changes

Merging changes made to FitPro into my own repo