Added working code for 3a and 3b (and also 12,000 other files..)