WIP
removed stuff
Abstract feedback stuff to another file.
Move more to feedback from base.
Fix small errors during refactor.