Moving to plan D, any suggestions? (warning - long post)