James/action transition

@ebryn @shajith @jish