finished quick draft of all features, check it out and add/amend please