Poured foundation for classes.

This might mess up branch if it does we can revert.