Added load functionality, improved saving