spacing
structs, refactoring
username stuff broken out into own method