ane move fns elsewhere
Latest commit 7e6324e Sep 4, 2017