Add CLI and tick loops