wooooo cleaned up and something is working