little progress to make more feature working