Added back in Thomas data
Reduced dependencies, formatted docs