initial gameplay support
better null checking
better null checking