WIP still need event triggering to work