Entire codebase refactored sucessfully. Icons and points not working yet