All basic components in place, now have to add more functionality.