WIP - More entity control and a World handler