Address points 3-5 of #174