Inital commit with working lookup and stats