Work on framework consilidation and beacon