Moved some behavior code
moved save and reload
added some moved code to class body
some refacotring
replaced old behavior call with the new api