Updated everything

Out with the old, in with the new