Balanced v1.1

Re-attempting the v1.1 merge.