some entity stuff - have to fix constructor