Made i fix for resolution.. not 100% needs some refactoring.. but close now