Fixed issues commented out before

I have a circular dependency and I fixed the code so it no longer exists
and brought back all the code that i had to comment out.