got some reworking to do