Put all back in one package - cmd line compilation can’t be annoying
for prom submission.