WIP
v1.5 - lots of improvements