Move to own file. Logic is 1 class = 1 file