quick switch to play2 & added persistence layer