make Entity more generic
move player between layers