Managed to get things working again with new classes