Admin flow is done and login works and stuff
fixed merge issue