Personally I think this would make more sense before API