Changes to Class Home

I have fixed certain things within the code to use the Core. However, I
still haven't tested it out yet, I will let you know once I get
functionality.