Entity Classes

I will update the classes as I work on them