Fixed bad happiness calculation Added new serialised component system, should make Entity less monolithic