Started working on onMove, plus other random stuff