Splitting off TapService WIP
Reformat