moved other logic into api project