added some more stuff, entity, also conversions coming in the next commit
added conversions