Tried splitting up into two classes, reverted back to previous version