Sixth revision

All base functinality works well.