In process of making it more idiomatic and functional and updating for new
freebase format