just about got it
adding some hackery