Moving classes, simplifying methods.
Hope this works