Branch rkgtech

Phil - hopefully these should be the changes as of this weekend. Please check and let me know.