Separate sample commander events

Just in case we want to isolate them out