Case fixing

Data structure still needs work