Update 1.4.0 - Re-Write

Currently a full re-write is in progress.