Split into modules. Started moving over prices