To be honest, I do not quite remember everything I changed here today. But it is all good, I tell ya.
note: run tests and add exceptions