dumbed everything from this branch to start simpler aproach