Refactoring of feature. Everything should be working. Tests next
Removed console logs