Orginized some code, ready to add login