stored data, added placeholder content provider
clean up of code and more work on content provider
merged