work in progress
work in progress
merged andreas and arvinds branches
removed temp files from index