Still trying to get sanity out of gameplay code...