steventroughtonsmith Adds proper saving & shortcut library