Version 0.16 - almost done!