Fixing some cherrypick merging issues
Some basic changes to fix issues w/ null pointers... still a frustrating mess though
just gonna push up to push over to other machine
Killing some unescessary tabs
Removing unused imports
Committing stuff
Merged some warning fixes, propogated field type refactorings