more feature work
more work on adding features