Added inventory and converted to Razor