finally have this mosting working I think