Small adjustments of prototype after discussion. Far from finished