yeah definitely need a rework