I don't even want to comment on what we changed. It was a lot.

Signed-off-by: thomasaj91 <thomasaj@uwm.edu>