Branch for Franq Review

Created this branch for review