You should probably consider pulling these out of your working branch, once we have the login and persistence working.