Fixing weird issues
PUtting it back
Fixing capitalization problems
Moving Back again
Adding a FIXME