V1.3.2

Shortened code ahead of complete re-write