Broken, re-factoring Persistance