Another backup as I go

More stuff implemented, no time to explain