started building ;egacy app
aligning with master