Newgen kit

@bures 
Third time - I think this is correct now.