guess I need to improve testability / testing over here