WIP - Handle closed events