Moved name to the config
Made add fluent
Wrote some tests