2/3 day trader refactor