A start on improving build times