Adding some error handling to lucene querying
Removing unused code and rewriting views as Class based