Split the classes up. It is a bit easier to find things now