Inital commit with working lookup and stats
Added more types