Started implementing persistent behavior