Work on #4
3.1 and 3.3 done (#4)