Everything working .. ish