First commit, copy from crossfitqc
merge