removing this failed fix for now. Will look to it later
Styling and fixing base usage.