Refactoring is ongoing. Import into the database iw working. Next work on logins.