Final class split, methods to be added and updated