Fixed some Persistance & Controller issues.

(Controllers need to convert from entry to interface)