BACKLOG

starting the refactor