Created by: onyxfish
Once complete this will close #494 (closed) and #496 (closed) and #497 (closed).