Completely rebuilt project to deal with performance issues