Staging into master

added more index and continuing with mockup