Feature/newschool login