Snapshot #1

+Working Entity Structure
-Old code