Refactored
Started adding categories
Preparing for new release in production
An extra tweak for production