same stuff cleaned up a little
Merge branch 'dlee440' into sjklein92_b
Update
Reorganized structure