Added some basic entities and implemented logic basics