Next commit

All ready, first debugging.