Framework in place most functions coded