Updated to commands, half step to custom macros.