Updated bang-functions, really need to split this out to it's own project