Found missing mv command. Hopefully close to finalising this now.
Version 0.0.18