Some basic formatting issues
Started work on implementing users