First step in starting to fix this issue
Clean this up a bit
Step two