Starting to break up massive file and cleanup