some intro/theory editing still to do but close