Worked on basic framework