Post Maven re-try
Moderately working
Tidying up for porting.