last commit before tearing up gameplay..?