Continued work on unit control/movement/attack