Happy paths now working