finally working, needs refining