first commit of code for APG re-design