More Error catching
Not much today... Login 80% complete