trying to work on refactor
Should have a new ui working