Entity Class updated. Should be functional now. Details displayed in
comments above. Use these functions from now on so that we don't have to
do this later on.