added save  / load methods.
fixing merge conflicts