just checking in a lot of typing, not done yet...