major changes - will update dev notes later