Merge "Controllers must have buttons and a movement mechanism." into klp-modular-dev