Names
Added all the names,
Should be ready for a first release after rewrite