finally working (sort of)