Split; TODO from build to own file