Intermediate checkin, loggin added(needs anyway quite some work....)