nearly finished

@alfred42