Feature 3.1 + 4

3.2, 3.3 to go