Working on #1 + name refactoring