Finish 3.2, closes #4