started adding memory, partly fixed login