Cont'd WIP: Refactor Entity for easier future use.