Some internal notes and testing