diff --git a/Include/Tanshu.Common.dll b/Include/Tanshu.Common.dll
index 621f5d3..063d73d 100644
Binary files a/Include/Tanshu.Common.dll and b/Include/Tanshu.Common.dll differ
diff --git a/Tanshu.Accounts.Contracts/Attributes/CascadeAttribute.cs b/Tanshu.Accounts.Contracts/Attributes/CascadeAttribute.cs
new file mode 100644
index 0000000..d6b3bb0
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/Attributes/CascadeAttribute.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Tanshu.Accounts.Contracts
+{
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+    public class CascadeAttribute : Attribute
+    {
+        private string message = string.Empty;
+        public string Message
+        {
+            get { return message; }
+            set { message = value; }
+        }
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/Attributes/NotNullAttribute.cs b/Tanshu.Accounts.Contracts/Attributes/NotNullAttribute.cs
new file mode 100644
index 0000000..5c7a241
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/Attributes/NotNullAttribute.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Tanshu.Accounts.Contracts
+{
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+    public class NotNullAttribute : Attribute
+    {
+        private string message = string.Empty;
+        public string Message
+        {
+            get { return message; }
+            set { message = value; }
+        }
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/Attributes/SecutiryAttribute.cs b/Tanshu.Accounts.Contracts/Attributes/SecutiryAttribute.cs
new file mode 100644
index 0000000..4f2fa58
--- /dev/null
+++ b/Tanshu.Accounts.Contracts/Attributes/SecutiryAttribute.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Tanshu.Accounts.Contracts
+{
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+    public class SecurityAttribute : Attribute
+    {
+        private string message = string.Empty;
+        public string Message
+        {
+            get { return message; }
+            set { message = value; }
+        }
+    }
+}
diff --git a/Tanshu.Accounts.Contracts/Data Contracts Display/BillInventoryBO.cs b/Tanshu.Accounts.Contracts/Data Contracts Display/BillInventoryBO.cs
index c473592..87c4b48 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts Display/BillInventoryBO.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts Display/BillInventoryBO.cs	
@@ -11,31 +11,9 @@ namespace Tanshu.Accounts.Contracts
 
         public string Name { get; set; }
 
-        private decimal price;
-        public decimal Price
-        {
-            get { return price; }
-            set
-            {
-                if (value <= 0)
-                    throw new ArgumentException("Price has to be non-negative greater than zero.");
-                else
-                    price = value;
-            }
-        }
+        public decimal Price { get; set; }
 
-        private decimal quantity = 1;
-        public decimal Quantity
-        {
-            get { return quantity; }
-            set
-            {
-                if (value <= 0)
-                    throw new ArgumentException("Quantity has to be non-negative greater than zero.");
-                quantity = value;
-
-            }
-        }
+        public decimal Quantity { get; set; }
 
         private decimal discount = 0;
         public decimal Discount
@@ -57,7 +35,7 @@ namespace Tanshu.Accounts.Contracts
         {
             get
             {
-                return quantity * price * (1 - discount) * (1 + ServiceCharge) * Tax;
+                return Quantity * Price * (1 - discount) * (1 + ServiceCharge) * Tax;
             }
         }
 
@@ -66,7 +44,7 @@ namespace Tanshu.Accounts.Contracts
         {
             get
             {
-                return quantity * price * (1 - discount) * ServiceCharge;
+                return Quantity * Price * (1 - discount) * ServiceCharge;
             }
         }
 
@@ -74,7 +52,7 @@ namespace Tanshu.Accounts.Contracts
         {
             get
             {
-                return quantity * price * discount;
+                return Quantity * Price * discount;
             }
         }
 
@@ -82,7 +60,7 @@ namespace Tanshu.Accounts.Contracts
         {
             get
             {
-                return quantity * price * (1 - discount);
+                return Quantity * Price * (1 - discount);
             }
         }
 
@@ -103,14 +81,14 @@ namespace Tanshu.Accounts.Contracts
         {
             get
             {
-                return price * quantity * (1 - discount) * (1 + ServiceCharge) * (1 + Tax);
+                return Price * Quantity * (1 - discount) * (1 + ServiceCharge) * (1 + Tax);
             }
         }
         public decimal Additional
         {
             get
             {
-                return quantity - printed;
+                return Quantity - printed;
             }
         }
 
@@ -120,15 +98,29 @@ namespace Tanshu.Accounts.Contracts
         {
             get
             {
-                string output = string.Format("{0} @ Rs. {1:#.##}", Name, price);
+                string output = string.Format("{0} @ Rs. {1:#.##}", Name, Price);
                 if (discount != 0)
                     output += string.Format(" - {0:#.##%}", discount);
+                foreach (var item in Modifiers)
+                    output += string.Format("\n\r  --  {0}", item.Name);
                 return output;
+
+                //if (Price == 0)
+                //    return string.Format(" -- {0}", Name);
+                //string output = string.Format("{0} @ Rs. {1:#.##}", Name, Price);
+                //if (discount != 0)
+                //    output += string.Format(" - {0:#.##%}", discount);
+                //return output;
             }
         }
+        public override string ToString()
+        {
+            return string.Format("{0} - {1}", ProductID, Name);
+        }
         public IList<Modifier> Modifiers { get; set; }
         public BillInventory()
         {
+            Quantity = 1;
             printed = 0;
             isNew = true;
             Modifiers = new List<Modifier>();
diff --git a/Tanshu.Accounts.Contracts/Data Contracts Display/BillItemKey.cs b/Tanshu.Accounts.Contracts/Data Contracts Display/BillItemKey.cs
index 2076513..441a5e8 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts Display/BillItemKey.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts Display/BillItemKey.cs	
@@ -5,10 +5,11 @@ namespace Tanshu.Accounts.Contracts
 {
     public class BillItemKey
     {
-        public BillItemKey(int productID, bool isNew)
+        //Old = 0, New = 1, Modifiers = 2+
+        public BillItemKey(int ProductID, bool IsNew)
         {
-            ProductID = productID;
-            IsNew = isNew;
+            this.ProductID = ProductID;
+            this.IsNew = IsNew;
         }
 
         public int ProductID
@@ -41,7 +42,7 @@ namespace Tanshu.Accounts.Contracts
         {
             if (object.ReferenceEquals(null, a))
                 return object.ReferenceEquals(null, b);
-            
+
             if (!(a is BillItemKey))
                 return false;
             if (!(b is BillItemKey))
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/InventoryBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/InventoryBO.cs
index 6fc15b7..6ffcd5e 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts/InventoryBO.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts/InventoryBO.cs	
@@ -2,13 +2,16 @@
 using System.Runtime.Serialization;
 using FluentNHibernate.Mapping;
 using System.Collections.Generic;
+using Tanshu.Accounts.Contracts;
 
 namespace Tanshu.Accounts.Entities
 {
     public class Inventory
     {
         public virtual int InventoryID { get; set; }
+        [NotNull]
         public virtual Voucher Voucher { get; set; }
+        [NotNull]
         public virtual Product Product { get; set; }
 
         private decimal quantity;
@@ -72,6 +75,7 @@ namespace Tanshu.Accounts.Entities
 
         }
 
+        [Cascade]
         public virtual IList<InventoryModifier> InventoryModifier { get; set; }
 
         decimal? amount;
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/InventoryModifierBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/InventoryModifierBO.cs
index 193b5b3..0ec01db 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts/InventoryModifierBO.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts/InventoryModifierBO.cs	
@@ -1,13 +1,16 @@
 using System;
 using System.Runtime.Serialization;
 using FluentNHibernate.Mapping;
+using Tanshu.Accounts.Contracts;
 
 namespace Tanshu.Accounts.Entities
 {
     public class InventoryModifier
     {
         public virtual int InventoryModifierID { get; set; }
+        [NotNull]
         public virtual Inventory Inventory { get; set; }
+        [NotNull]
         public virtual Modifier Modifier { get; set; }
     }
 }
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/ModifierBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/ModifierBO.cs
index d57a716..5dc327f 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts/ModifierBO.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts/ModifierBO.cs	
@@ -1,6 +1,8 @@
 using System;
 using System.Runtime.Serialization;
 using FluentNHibernate.Mapping;
+using System.Collections.Generic;
+using Tanshu.Accounts.Contracts;
 
 namespace Tanshu.Accounts.Entities
 {
@@ -9,6 +11,9 @@ namespace Tanshu.Accounts.Entities
         public virtual int ModifierID { get; set; }
         public virtual string Name { get; set; }
 
+        [NotNull]
+        public virtual IList<ProductGroupModifier> ProductGroupModifiers { get; set; }
+
         public override int GetHashCode()
         {
             return ModifierID.GetHashCode() ^ Name.GetHashCode();
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/PrintLocationBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/PrintLocationBO.cs
index 102230d..1006e29 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts/PrintLocationBO.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts/PrintLocationBO.cs	
@@ -6,12 +6,12 @@ namespace Tanshu.Accounts.Entities
 {
     public class PrintLocation
     {
-        public int PrintLocationID { get; set; }
-        public ProductGroup ProductGroup { get; set; }
-        public string Location { get; set; }
-        public string Printer { get; set; }
-        public int Copies { get; set; }
-        public string CutCode { get; set; }
+        public virtual int PrintLocationID { get; set; }
+        public virtual ProductGroup ProductGroup { get; set; }
+        public virtual string Location { get; set; }
+        public virtual string Printer { get; set; }
+        public virtual int Copies { get; set; }
+        public virtual string CutCode { get; set; }
 
         public override bool Equals(System.Object obj)
         {
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/ProductBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/ProductBO.cs
index 2c493c0..8ccbb05 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts/ProductBO.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts/ProductBO.cs	
@@ -15,8 +15,6 @@ namespace Tanshu.Accounts.Entities
         public virtual decimal ServiceCharge { get; set; }
         public virtual decimal SalePrice { get; set; }
         public virtual bool Discontinued { get; set; }
-        public virtual decimal MinimumLevel { get; set; }
-        public virtual decimal MaximumLevel { get; set; }
         public virtual int SortOrder { get; set; }
     }
 }
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/SettleOption.cs b/Tanshu.Accounts.Contracts/Data Contracts/SettleOption.cs
index 098f536..1ef7d55 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts/SettleOption.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts/SettleOption.cs	
@@ -7,8 +7,8 @@ namespace Tanshu.Accounts.Entities
 {
     public class SettleOption
     {
-        public int SettleOptionID { get; set; }
-        public string Name { get; set; }
+        public virtual int SettleOptionID { get; set; }
+        public virtual string Name { get; set; }
 
         public override bool Equals(System.Object obj)
         {
diff --git a/Tanshu.Accounts.Contracts/Data Contracts/VoucherBO.cs b/Tanshu.Accounts.Contracts/Data Contracts/VoucherBO.cs
index 44fe5ca..03cdb03 100644
--- a/Tanshu.Accounts.Contracts/Data Contracts/VoucherBO.cs	
+++ b/Tanshu.Accounts.Contracts/Data Contracts/VoucherBO.cs	
@@ -3,6 +3,7 @@ using System.Runtime.Serialization;
 using FluentNHibernate.Mapping;
 using Tanshu.Accounts.Entities.Auth;
 using System.Collections.Generic;
+using Tanshu.Accounts.Contracts;
 
 namespace Tanshu.Accounts.Entities
 {
@@ -17,6 +18,7 @@ namespace Tanshu.Accounts.Entities
         public virtual DateTime CreationDate { get; set; }
         public virtual DateTime LastEditDate { get; set; }
         public virtual char Type { get; set; }
+        [Cascade]
         public virtual IList<Inventory> Inventories { get; set; }
         public Voucher()
         {
diff --git a/Tanshu.Accounts.Contracts/Tanshu.Accounts.Contracts.csproj b/Tanshu.Accounts.Contracts/Tanshu.Accounts.Contracts.csproj
index 5375232..ddaef3f 100644
--- a/Tanshu.Accounts.Contracts/Tanshu.Accounts.Contracts.csproj
+++ b/Tanshu.Accounts.Contracts/Tanshu.Accounts.Contracts.csproj
@@ -85,6 +85,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Attributes\CascadeAttribute.cs" />
+    <Compile Include="Attributes\SecutiryAttribute.cs" />
+    <Compile Include="Attributes\NotNullAttribute.cs" />
     <Compile Include="Data Contracts Display\BillItemKey.cs">
       <SubType>Code</SubType>
     </Compile>
diff --git a/Tanshu.Accounts.Helpers/ControlFactory.cs b/Tanshu.Accounts.Helpers/ControlFactory.cs
index 416c7ea..0df92ea 100644
--- a/Tanshu.Accounts.Helpers/ControlFactory.cs
+++ b/Tanshu.Accounts.Helpers/ControlFactory.cs
@@ -7,6 +7,8 @@ using System.Drawing;
 using Tanshu.Accounts.Contracts;
 using Tanshu.Accounts.Entities;
 using System.Collections;
+using Tanshu.Accounts.Repository;
+using Tanshu.Common.KeyboardControl;
 
 namespace Tanshu.Accounts.Helpers
 {
@@ -31,7 +33,12 @@ namespace Tanshu.Accounts.Helpers
             for (int i = 0; i < list.Count; i++)
             {
                 var item = list[i];
+                var status = SaleVoucherBI.GetTableStatus(item.Name);
                 var control = GetButton(string.Format("g{0}", i), item.Name, size.X, size.Y, item, bcDelegate);
+                if (status == "printed")
+                    control.BackColor = Color.Green;
+                else if (status == "running")
+                    control.BackColor = Color.Red;
                 //var control = GetButton(string.Format("g{0}", i), string.Format("{0} {1}", item.ProductGroupID, item.Name), size.X, size.Y, item, bcDelegate);
                 panel.Controls.Add(control);
                 buttonList.Add(control);
@@ -56,7 +63,7 @@ namespace Tanshu.Accounts.Helpers
             for (int i = 0; i < list.Count; i++)
             {
                 var item = list[i];
-                var control = GetButton(string.Format("p{0}", i), string.Format("{0} ({1})", item.Name, item.Units), size.X, size.Y, item, bcDelegate);
+                var control = GetButton(string.Format("p{0}", i), item.Units == string.Empty ? item.Name : string.Format("{0} ({1})", item.Name, item.Units), size.X, size.Y, item, bcDelegate);
                 //var control = GetButton(string.Format("g{0}", i), string.Format("{0} {1}", item.ProductGroupID, item.Name), size.X, size.Y, item, bcDelegate);
                 panel.Controls.Add(control);
                 buttonList.Add(control);
@@ -64,6 +71,24 @@ namespace Tanshu.Accounts.Helpers
 
 
 
+        }
+        public static void GenerateGroups(ref FlowLayoutPanel panel, ref IList<UnselectableCheckbox> controlList, Point size, IList<ProductGroup> list, ButtonClickDelegate bcDelegate)
+        {
+            if (controlList.Count != 0)
+            {
+                for (int i = controlList.Count - 1; i >= 0; i--)
+                {
+                    controlList[i].Dispose();
+                }
+                controlList = new List<UnselectableCheckbox>();
+            }
+            for (int i = 0; i < list.Count; i++)
+            {
+                var item = list[i];
+                var control = GetUnselectableCheckbox(i.ToString(), item.Name, size.X, size.Y, item, bcDelegate);
+                panel.Controls.Add(control);
+                controlList.Add(control);
+            }
         }
         public static void GenerateGroups(ref FlowLayoutPanel panel, ref List<Button> buttonList, Point size, int start, IList<ProductGroup> inList, ButtonClickDelegate bcDelegate)
         {
@@ -146,6 +171,22 @@ namespace Tanshu.Accounts.Helpers
                 control.Click += new EventHandler(bcDelegate);
             return control;
         }
+        private static UnselectableCheckbox GetUnselectableCheckbox(string name, string text, int width, int height, object tag, ButtonClickDelegate bcDelegate)
+        {
+            UnselectableCheckbox control = new UnselectableCheckbox()
+            {
+                Name = name,
+                Text = text,
+                Width = width,
+                Height = height,
+                Tag = tag,
+                Appearance = Appearance.Button,
+
+            };
+            if (bcDelegate != null)
+                control.Click += new EventHandler(bcDelegate);
+            return control;
+        }
         private static CheckBox GetCheckbox(string name, string text, int width, int height, object tag, ButtonClickDelegate bcDelegate)
         {
             CheckBox control = new CheckBox()
@@ -156,7 +197,7 @@ namespace Tanshu.Accounts.Helpers
                 Height = height,
                 Tag = tag,
                 Appearance = Appearance.Button,
-                
+
             };
             if (bcDelegate != null)
                 control.Click += new EventHandler(bcDelegate);
diff --git a/Tanshu.Accounts.Helpers/SelectWaiter.cs b/Tanshu.Accounts.Helpers/SelectWaiter.cs
index 671d9e6..08bbb88 100644
--- a/Tanshu.Accounts.Helpers/SelectWaiter.cs
+++ b/Tanshu.Accounts.Helpers/SelectWaiter.cs
@@ -21,7 +21,6 @@ namespace Tanshu.Accounts.Helpers
             filters.Add("Name");
             SetFilterColumns(filters);
             grid.Columns["WaiterID"].Visible = false;
-            grid.Columns["timestamp"].Visible = false;
         }
 
         protected override void FilterChanged(Dictionary<string, string> filter)
diff --git a/Tanshu.Accounts.PointOfSale/Sales/AdjustAdvanceForm.cs b/Tanshu.Accounts.PointOfSale/Advances/AdjustAdvanceForm.cs
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/AdjustAdvanceForm.cs
rename to Tanshu.Accounts.PointOfSale/Advances/AdjustAdvanceForm.cs
diff --git a/Tanshu.Accounts.PointOfSale/Sales/AdjustAdvanceForm.designer.cs b/Tanshu.Accounts.PointOfSale/Advances/AdjustAdvanceForm.designer.cs
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/AdjustAdvanceForm.designer.cs
rename to Tanshu.Accounts.PointOfSale/Advances/AdjustAdvanceForm.designer.cs
diff --git a/Tanshu.Accounts.PointOfSale/Sales/AdjustAdvanceForm.resx b/Tanshu.Accounts.PointOfSale/Advances/AdjustAdvanceForm.resx
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/AdjustAdvanceForm.resx
rename to Tanshu.Accounts.PointOfSale/Advances/AdjustAdvanceForm.resx
diff --git a/Tanshu.Accounts.PointOfSale/Sales/RecieveAdvanceForm.cs b/Tanshu.Accounts.PointOfSale/Advances/RecieveAdvanceForm.cs
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/RecieveAdvanceForm.cs
rename to Tanshu.Accounts.PointOfSale/Advances/RecieveAdvanceForm.cs
diff --git a/Tanshu.Accounts.PointOfSale/Sales/RecieveAdvanceForm.designer.cs b/Tanshu.Accounts.PointOfSale/Advances/RecieveAdvanceForm.designer.cs
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/RecieveAdvanceForm.designer.cs
rename to Tanshu.Accounts.PointOfSale/Advances/RecieveAdvanceForm.designer.cs
diff --git a/Tanshu.Accounts.PointOfSale/Sales/RecieveAdvanceForm.resx b/Tanshu.Accounts.PointOfSale/Advances/RecieveAdvanceForm.resx
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/RecieveAdvanceForm.resx
rename to Tanshu.Accounts.PointOfSale/Advances/RecieveAdvanceForm.resx
diff --git a/Tanshu.Accounts.PointOfSale/Controllers/BillController.cs b/Tanshu.Accounts.PointOfSale/Controllers/BillController.cs
index b651517..92a4e46 100644
--- a/Tanshu.Accounts.PointOfSale/Controllers/BillController.cs
+++ b/Tanshu.Accounts.PointOfSale/Controllers/BillController.cs
@@ -10,6 +10,7 @@ using Tanshu.Common;
 using Tanshu.Accounts.Entities;
 using Tanshu.Accounts.Entities.Auth;
 using Tanshu.Accounts.SqlDAO;
+using System.Collections.ObjectModel;
 
 
 namespace Tanshu.Accounts.PointOfSale
@@ -17,6 +18,8 @@ namespace Tanshu.Accounts.PointOfSale
     public class BillController
     {
         private SaleVoucher billInfo;
+        // private KeyedCollection<BillItemKey, BillInventory> b1 = new KeyedCollection<BillItemKey, BillInventory>();
+
         private OrderedDictionary<BillItemKey, BillInventory> bill = new OrderedDictionary<BillItemKey, BillInventory>();
         int? newBillID;
 
@@ -58,12 +61,36 @@ namespace Tanshu.Accounts.PointOfSale
 
         public void ShowModifiers(int productGroupID, BillInventory item)
         {
+            if (item.Printed > 0)
+                return;
             var list = ProductGroupModifierBI.GetProductGroupModifiers(productGroupID);
             using (var frm = new ModifierForm(list, item.Modifiers))
             {
                 frm.ShowDialog();
                 item.Modifiers = frm.Selection;
             }
+            ShowAmount();
+        }
+
+        public void ShowDiscount()
+        {
+            var list = new ProductGroupBI().GetProductGroups();
+            using (var frm = new DiscountForm(list))
+            {
+                if (frm.ShowDialog() == DialogResult.OK)
+                {
+                    IList<int> outList;
+                    decimal discount = frm.Selection(out outList);
+                    discount = discount / 100;
+                    foreach (var item in bill)
+                    {
+                        var pg = new ProductGroupBI().GetProductGroupOfProduct(item.Value.ProductID);
+                        if (outList.Contains(pg.ProductGroupID))
+                            item.Value.Discount = discount;
+                    }
+                }
+            }
+            ShowAmount();
         }
 
         public void ShowCustomerList(bool reset)
@@ -100,7 +127,7 @@ namespace Tanshu.Accounts.PointOfSale
         {
             using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_EDIT_BILL))
             {
-                if ((billInfo != null) && (new SaleVoucherBI().IsBillPrinted(billInfo.VoucherID)) && (!roleBI.IsAllowed))
+                if ((billInfo != null) && (SaleVoucherBI.IsBillPrinted(billInfo.VoucherID)) && (!roleBI.IsAllowed))
                 {
                     throw new PermissionException("You do not have the permission to reprint a bill.");
                 }
@@ -151,7 +178,7 @@ namespace Tanshu.Accounts.PointOfSale
             #region Inventories
             IList<Inventory> iList = GetInventoryForBill(bill.Values);
             #endregion
-            new SaleVoucherBI().Insert(saleVoucher, iList);
+            SaleVoucherBI.Insert(saleVoucher, iList);
             return saleVoucher.VoucherID;
 
         }
@@ -172,7 +199,7 @@ namespace Tanshu.Accounts.PointOfSale
             #region Inventory
             IList<Inventory> iList = GetInventoryForBill(bill.Values);
             #endregion
-            new SaleVoucherBI().Update(billInfo, iList);
+            SaleVoucherBI.Update(billInfo, iList);
             return billInfo.VoucherID;
         }
         private IList<Inventory> GetInventoryForBill(ICollection<BillInventory> list)
@@ -185,6 +212,8 @@ namespace Tanshu.Accounts.PointOfSale
                 {
                     temp = localList[item.ProductID];
                     temp.Quantity += item.Quantity;
+                    foreach (var mod in item.Modifiers)
+                        temp.InventoryModifier.Add(new InventoryModifier() { Modifier = mod });
                 }
                 else
                 {
@@ -193,6 +222,8 @@ namespace Tanshu.Accounts.PointOfSale
                     temp.Quantity = item.Quantity;
                     temp.Rate = item.Price;
                     temp.Tax = item.Tax;
+                    foreach (var mod in item.Modifiers)
+                        temp.InventoryModifier.Add(new InventoryModifier() { Modifier = mod });
                     localList.Add(item.ProductID, temp);
                 }
             }
@@ -201,7 +232,7 @@ namespace Tanshu.Accounts.PointOfSale
         public decimal GetInput(string type, decimal basic)
         {
             decimal value;
-            InputBoxResult result = InputBox.Show(type, type, basic.ToString(), InputBox_Validating);
+            InputBoxResult result = InputBox.Show(type, basic.ToString(), InputBox_Validating);
             if (result.OK)
             {
                 if (!decimal.TryParse(result.Text, out value))
@@ -213,34 +244,31 @@ namespace Tanshu.Accounts.PointOfSale
         #endregion
         public void VoidBill()
         {
-            if (billInfo != null)
+            if (billInfo == null)
+                return;
+            if (!billInfo.Printed)
+                return;
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_VOID_BILL))
             {
-                if (billInfo.Printed)
+                if (roleBI.IsAllowed)
                 {
-                    using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_VOID_BILL))
+                    if (MessageBox.Show("Are you sure you want to void this bill?", "Void Bill", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes)
                     {
-                        if (roleBI.IsAllowed)
+                        SelectVoidReason voidReason = new SelectVoidReason(GetVoidReason, true);
+                        voidReason.ShowDialog();
+                        if (voidReason.SelectedItem != null)
                         {
-
-                            if (MessageBox.Show("Are you sure you want to void this bill?", "Void Bill", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes)
-                            {
-                                SelectVoidReason voidReason = new SelectVoidReason(GetVoidReason, true);
-                                voidReason.ShowDialog();
-                                if (voidReason.SelectedItem != null)
-                                {
-                                    new SaleVoucherBI().VoidBill(billInfo.VoucherID, voidReason.SelectedItem.Description);
-                                    ClearBill();
-                                }
-                                else
-                                {
-                                    MessageBox.Show("Please Select a reason if you want to void the bill", "Bill NOT Voided", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
-                                }
-                            }
+                            SaleVoucherBI.VoidBill(billInfo.VoucherID, voidReason.SelectedItem.Description);
+                            ClearBill();
                         }
                         else
-                            throw new PermissionException("You do not have the permission to void a bill.");
+                        {
+                            MessageBox.Show("Please Select a reason if you want to void the bill", "Bill NOT Voided", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);
+                        }
                     }
                 }
+                else
+                    throw new PermissionException("You do not have the permission to void a bill.");
             }
         }
         Customer selectCustomer_customerEvent(object sender, CustomerEventArgs e)
@@ -357,7 +385,7 @@ namespace Tanshu.Accounts.PointOfSale
             if (item != null)
             {
                 decimal rate = 0;
-                InputBoxResult result = InputBox.Show("Enter Rate", "Rate", item.Price.ToString(), InputBox_Validating);
+                InputBoxResult result = InputBox.Show("Rate", item.Price.ToString(), InputBox_Validating);
                 if (result.OK)
                     rate = Convert.ToDecimal(result.Text);
                 if (rate != 0)
@@ -374,19 +402,20 @@ namespace Tanshu.Accounts.PointOfSale
         {
             ClearBill();
             IList<Inventory> iList = new List<Inventory>();
-            new SaleVoucherBI().GetSaleVoucher(voucherID, out billInfo, out iList);
+            SaleVoucherBI.GetSaleVoucher(voucherID, out billInfo, out iList);
 
             this.customer = billInfo.Customer;
             saleForm.ShowInfo(billInfo.BillID, billInfo.KotID, billInfo.CreationDate, billInfo.Date.Value, billInfo.LastEditDate, customer.Name, billInfo.TableID, billInfo.Waiter.WaiterID, billInfo.Waiter.Name);
 
             foreach (Inventory inventory in iList)
             {
-                BillItemKey key = new BillItemKey(inventory.Product.ProductID, inventory.Quantity == 0);
+                BillItemKey key = new BillItemKey(inventory.Product.ProductID, false);
+                var product = ProductBI.GetProduct(inventory.Product.ProductID);
                 var item = new BillInventory
                 {
-                    ProductID = inventory.Product.ProductID,
+                    ProductID = product.ProductID,
                     Discount = inventory.Discount,
-                    Name = inventory.Product.Name + " (" + inventory.Product.Units + ")",
+                    Name = product.Units == string.Empty ? product.Name : product.Name + " (" + product.Units + ")",
                     Price = inventory.Rate,
                     Printed = inventory.Quantity,
                     Quantity = inventory.Quantity,
@@ -394,9 +423,7 @@ namespace Tanshu.Accounts.PointOfSale
                     ServiceCharge = inventory.ServiceCharge,
                 };
                 foreach (var mod in inventory.InventoryModifier)
-                {
                     item.Modifiers.Add(mod.Modifier);
-                }
                 bill.Add(key, item);
             }
             ShowAmount();
@@ -406,7 +433,7 @@ namespace Tanshu.Accounts.PointOfSale
         {
             if (!string.IsNullOrEmpty(tableName))
             {
-                SaleVoucher voucher = new SaleVoucherBI().GetPendingVoucherID(tableName);
+                SaleVoucher voucher = SaleVoucherBI.GetPendingVoucherID(tableName);
                 if (voucher != null)
                 {
                     LoadBill(voucher.VoucherID);
@@ -415,13 +442,13 @@ namespace Tanshu.Accounts.PointOfSale
             }
             else
             {
-                InputBoxResult result = InputBox.Show("Enter Table Number", "Table", "0", InputBox_Validating);
+                InputBoxResult result = InputBox.Show("Table Number", "0", InputBox_Validating);
                 if (result.OK)
                 {
                     string tableID = result.Text.Trim();
                     if ((tableID != "C") && (tableID != "") && (!tableID.Contains(".")))
                     {
-                        SaleVoucher voucher = new SaleVoucherBI().GetPendingVoucherID(tableName);
+                        SaleVoucher voucher = SaleVoucherBI.GetPendingVoucherID(tableName);
                         if (voucher != null)
                         {
                             LoadBill(voucher.VoucherID);
@@ -460,6 +487,8 @@ namespace Tanshu.Accounts.PointOfSale
         {
             if (billInfo == null)
                 return;
+            if (!billInfo.Printed)
+                return;
             int option = SettleOptionFactory.Unsettled;
             using (BillSettleForm frm = new BillSettleForm())
             {
@@ -468,7 +497,7 @@ namespace Tanshu.Accounts.PointOfSale
             }
             if (option != SettleOptionFactory.Unsettled)
             {
-                new SaleVoucherBI().SettleVoucher(Session.User, billInfo.VoucherID, option);
+                SaleVoucherBI.SettleVoucher(Session.User, billInfo.VoucherID, option);
                 ClearBill();
             }
         }
diff --git a/Tanshu.Accounts.PointOfSale/MainForm.cs b/Tanshu.Accounts.PointOfSale/MainForm.cs
index 7c27abd..99fa211 100644
--- a/Tanshu.Accounts.PointOfSale/MainForm.cs
+++ b/Tanshu.Accounts.PointOfSale/MainForm.cs
@@ -1,13 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Threading;
 using System.Windows.Forms;
-using Tanshu.Accounts.Repository;
 using Tanshu.Accounts.Contracts;
-using Tanshu.Accounts.Helpers;
-//using Tanshu.Accounts.PointOfSale.Updates;
 using Tanshu.Accounts.Entities.Auth;
-using Tanshu.Accounts.SqlDAO;
+using Tanshu.Accounts.Helpers;
+using Tanshu.Accounts.Repository;
+using System.Collections.Generic;
 
 namespace Tanshu.Accounts.PointOfSale
 {
@@ -18,48 +15,6 @@ namespace Tanshu.Accounts.PointOfSale
             InitializeComponent();
         }
 
-        private void advancesToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_SALES_BILL))
-            {
-                if (roleBI.IsAllowed)
-                {
-                    using (RecieveAdvanceForm frm = new RecieveAdvanceForm())
-                        frm.ShowDialog();
-                }
-            }
-        }
-
-        private void paymentsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_SALES_BILL))
-            {
-                if (roleBI.IsAllowed)
-                {
-                    using (AdjustAdvanceForm frm = new AdjustAdvanceForm())
-                        frm.ShowDialog();
-                }
-            }
-        }
-
-        private void exitToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            this.Close();
-        }
-
-        private void createNewUserToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SECURITY_MANAGE_ROLES))
-            {
-                if (roleBI.IsAllowed)
-                    using (SelectUser form = new SelectUser(UserBI.GetFilteredUsers, true))
-                    {
-                        form.userEvent += new UserEventHandler(form_userEvent);
-                        form.ShowDialog();
-                    }
-            }
-        }
-
         User form_userEvent(object sender, UserEventArgs e)
         {
             User user = e.User;
@@ -82,119 +37,6 @@ namespace Tanshu.Accounts.PointOfSale
             return new User();
         }
 
-        private void changePasswordToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using (ChangePassword frm = new ChangePassword())
-                frm.ShowDialog();
-        }
-
-        private void assignRolesToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SECURITY_MANAGE_ROLES))
-            {
-                if (roleBI.IsAllowed)
-                    using (AssignRoles frm = new AssignRoles())
-                        frm.ShowDialog();
-
-            }
-        }
-
-        private void salesAnalysisToolStripMenuItem1_Click(object sender, EventArgs e)
-        {
-            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_SALE_DETAIL))
-            {
-                if (roleBI.IsAllowed)
-                    using (frmSaleAnalysisForm frm = new frmSaleAnalysisForm())
-                        frm.ShowDialog();
-            }
-        }
-
-        private void cashierCheckoutToolStripMenuItem1_Click(object sender, EventArgs e)
-        {
-            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_CHECKOUT))
-            {
-                if (roleBI.IsAllowed)
-                    using (Cashier_Checkout_Form frm = new Cashier_Checkout_Form())
-                        frm.ShowDialog();
-            }
-        }
-
-        private void customersToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            //Guid c=new Guid("28BFB512-6B92-4AA1-A931-7993593B8E07");
-            using (CustomersForm Customer = new CustomersForm(null, ""))
-            {
-                Customer.ShowDialog();
-            }
-        }
-
-        private void productsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.MASTER_PRODUCTS))
-            {
-                if (roleBI.IsAllowed)
-                    using (ProductsForm frm = new ProductsForm())
-                        frm.ShowDialog();
-            }
-        }
-
-        private void prToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            ProductTypes ProductType = new ProductTypes();
-            ProductType.ShowDialog();
-            ProductType.Dispose();
-        }
-
-        private void viewLogToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            //using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.LOG_VIEW))
-            //{
-            //    if (roleBI.IsAllowed)
-            //        using (LogViewerForm frm = new LogViewerForm())
-            //            frm.ShowDialog();
-            //}
-        }
-
-        //private void updateToolStripMenuItem_Click(object sender, EventArgs e)
-        //{
-        //    using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.MASTER_OWNER))
-        //    {
-        //        if (roleBI.IsAllowed)
-        //            using (UpdateForm frm = new UpdateForm())
-        //                frm.ShowDialog();
-        //    }
-        //}
-
-        //private void reportToolStripMenuItem_Click(object sender, EventArgs e)
-        //{
-        //    using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.MASTER_OWNER))
-        //    {
-        //        if (roleBI.IsAllowed)
-        //            using (SaleTaxReportForm frm = new SaleTaxReportForm())
-        //                frm.ShowDialog();
-        //    }
-        //}
-
-        //private void updateBillsToolStripMenuItem_Click(object sender, EventArgs e)
-        //{
-        //    using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.MASTER_OWNER))
-        //    {
-        //        if (roleBI.IsAllowed)
-        //            using (UpdateSales frm = new UpdateSales())
-        //                frm.ShowDialog();
-        //    }
-        //}
-
-        //private void autoToolStripMenuItem_Click(object sender, EventArgs e)
-        //{
-        //    using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.MASTER_OWNER))
-        //    {
-        //        if (roleBI.IsAllowed)
-        //            using (ReplaceForm frm = new ReplaceForm())
-        //                frm.ShowDialog();
-        //    }
-        //}
-
         private void btnLogin_Click(object sender, EventArgs e)
         {
             ILogin login = new KeyboardLogin();
@@ -212,6 +54,7 @@ namespace Tanshu.Accounts.PointOfSale
                 this.Text = "Main Menu - Login";
                 btnLogin.Text = "Login";
             }
+            CheckRoles();
         }
 
         private void btnSale_Click(object sender, EventArgs e)
@@ -226,9 +69,187 @@ namespace Tanshu.Accounts.PointOfSale
             }
         }
 
-        private void button1_Click(object sender, EventArgs e)
+        private void btnProduct_Click(object sender, EventArgs e)
         {
-            Fixtures.CreateSchema();
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.MASTER_PRODUCTS))
+            {
+                if (roleBI.IsAllowed)
+                    using (ProductsForm frm = new ProductsForm())
+                        frm.ShowDialog();
+            }
+
+        }
+
+        private void btnProductGroup_Click(object sender, EventArgs e)
+        {
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.MASTER_PRODUCTS))
+            {
+                if (roleBI.IsAllowed)
+                    using (var frm = new ProductTypes())
+                        frm.ShowDialog();
+            }
+
+        }
+
+        private void btnCustomer_Click(object sender, EventArgs e)
+        {
+            using (CustomersForm Customer = new CustomersForm(null, ""))
+            {
+                Customer.ShowDialog();
+            }
+
+        }
+
+        private void btnInitial_Click(object sender, EventArgs e)
+        {
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.MASTER_OWNER))
+            {
+                if (roleBI.IsAllowed)
+                {
+                    Fixtures.CreateSchema();
+                    MessageBox.Show("Schema Recreated");
+                }
+            }
+
+        }
+
+        private void btnAdvanceReceive_Click(object sender, EventArgs e)
+        {
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_SALES_BILL))
+            {
+                if (roleBI.IsAllowed)
+                {
+                    using (RecieveAdvanceForm frm = new RecieveAdvanceForm())
+                        frm.ShowDialog();
+                }
+            }
+
+        }
+
+        private void btnAdvanceAdjust_Click(object sender, EventArgs e)
+        {
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_SALES_BILL))
+            {
+                if (roleBI.IsAllowed)
+                {
+                    using (AdjustAdvanceForm frm = new AdjustAdvanceForm())
+                        frm.ShowDialog();
+                }
+            }
+
+        }
+
+        private void btnExit_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void btnCreateUser_Click(object sender, EventArgs e)
+        {
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SECURITY_MANAGE_ROLES))
+            {
+                if (roleBI.IsAllowed)
+                    using (SelectUser form = new SelectUser(UserBI.GetFilteredUsers, true))
+                    {
+                        form.userEvent += new UserEventHandler(form_userEvent);
+                        form.ShowDialog();
+                    }
+            }
+
+        }
+
+        private void btnAssignRoles_Click(object sender, EventArgs e)
+        {
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SECURITY_MANAGE_ROLES))
+            {
+                if (roleBI.IsAllowed)
+                    using (AssignRoles frm = new AssignRoles())
+                        frm.ShowDialog();
+
+            }
+
+        }
+
+        private void btnChangePassword_Click(object sender, EventArgs e)
+        {
+            using (ChangePassword frm = new ChangePassword())
+                frm.ShowDialog();
+
+        }
+
+        private void btnCashierCheckout_Click(object sender, EventArgs e)
+        {
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_CHECKOUT))
+            {
+                if (roleBI.IsAllowed)
+                    using (Cashier_Checkout_Form frm = new Cashier_Checkout_Form())
+                        frm.ShowDialog();
+            }
+        }
+
+        private void btnSaleAnalysis_Click(object sender, EventArgs e)
+        {
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_SALE_DETAIL))
+            {
+                if (roleBI.IsAllowed)
+                    using (frmSaleAnalysisForm frm = new frmSaleAnalysisForm())
+                        frm.ShowDialog();
+            }
+
+        }
+
+        private void MainForm_Load(object sender, EventArgs e)
+        {
+            //foreach (Control item in this.flowLayoutPanel1.Controls)
+            //{
+            //    Button but = item as Button;
+            //    if (but != null)
+            //    {
+
+            //    }
+            //}
+
+            CheckRoles();
+        }
+        private void CheckRoles()
+        {
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.MASTER_OWNER))
+            {
+                if (roleBI.IsAllowed)
+                {
+                    btnInitial.Visible = true;
+                }
+                else
+                {
+                    btnInitial.Visible = false;
+                }
+            }
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.SALES_SALES_BILL))
+            {
+                if (roleBI.IsAllowed)
+                {
+                    btnSale.Visible = true;
+                    btnCustomer.Visible = true;
+                }
+                else
+                {
+                    btnSale.Visible = false;
+                    btnCustomer.Visible = true;
+                }
+            }
+            using (RoleBI roleBI = RoleFactoryBI.GetRoleBI(RolesConstants.MASTER_PRODUCTS))
+            {
+                if (roleBI.IsAllowed)
+                {
+                    btnProduct.Visible = true;
+                    btnProductGroup.Visible = true;
+                }
+                else
+                {
+                    btnProduct.Visible = false;
+                    btnProductGroup.Visible = false;
+                }
+            }
         }
     }
 }
diff --git a/Tanshu.Accounts.PointOfSale/MainForm.designer.cs b/Tanshu.Accounts.PointOfSale/MainForm.designer.cs
index 9580e11..23e750e 100644
--- a/Tanshu.Accounts.PointOfSale/MainForm.designer.cs
+++ b/Tanshu.Accounts.PointOfSale/MainForm.designer.cs
@@ -28,171 +28,29 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
-            this.masterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.prToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.productsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.customersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.transactionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.advancesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.paymentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.permissionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.createNewUserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.changePasswordToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.assignRolesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.reportsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.cashierCheckoutToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.salesAnalysisToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.viewLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.btnLogin = new System.Windows.Forms.Button();
             this.btnSale = new System.Windows.Forms.Button();
-            this.button1 = new System.Windows.Forms.Button();
-            this.menuStrip1.SuspendLayout();
+            this.btnInitial = new System.Windows.Forms.Button();
+            this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+            this.btnProduct = new System.Windows.Forms.Button();
+            this.btnProductGroup = new System.Windows.Forms.Button();
+            this.btnCustomer = new System.Windows.Forms.Button();
+            this.btnAdvanceReceive = new System.Windows.Forms.Button();
+            this.btnAdvanceAdjust = new System.Windows.Forms.Button();
+            this.btnExit = new System.Windows.Forms.Button();
+            this.btnCreateUser = new System.Windows.Forms.Button();
+            this.btnAssignRoles = new System.Windows.Forms.Button();
+            this.btnChangePassword = new System.Windows.Forms.Button();
+            this.btnCashierCheckout = new System.Windows.Forms.Button();
+            this.btnSaleAnalysis = new System.Windows.Forms.Button();
+            this.flowLayoutPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
-            // menuStrip1
-            // 
-            this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.masterToolStripMenuItem,
-            this.transactionsToolStripMenuItem,
-            this.permissionsToolStripMenuItem,
-            this.reportsToolStripMenuItem,
-            this.exitToolStripMenuItem});
-            this.menuStrip1.Location = new System.Drawing.Point(0, 0);
-            this.menuStrip1.Name = "menuStrip1";
-            this.menuStrip1.Size = new System.Drawing.Size(792, 24);
-            this.menuStrip1.TabIndex = 26;
-            this.menuStrip1.Text = "menuStrip1";
-            // 
-            // masterToolStripMenuItem
-            // 
-            this.masterToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.prToolStripMenuItem,
-            this.productsToolStripMenuItem,
-            this.customersToolStripMenuItem});
-            this.masterToolStripMenuItem.Name = "masterToolStripMenuItem";
-            this.masterToolStripMenuItem.Size = new System.Drawing.Size(55, 20);
-            this.masterToolStripMenuItem.Text = "Master";
-            // 
-            // prToolStripMenuItem
-            // 
-            this.prToolStripMenuItem.Name = "prToolStripMenuItem";
-            this.prToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
-            this.prToolStripMenuItem.Text = "Product Type";
-            this.prToolStripMenuItem.Click += new System.EventHandler(this.prToolStripMenuItem_Click);
-            // 
-            // productsToolStripMenuItem
-            // 
-            this.productsToolStripMenuItem.Name = "productsToolStripMenuItem";
-            this.productsToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
-            this.productsToolStripMenuItem.Text = "Products";
-            this.productsToolStripMenuItem.Click += new System.EventHandler(this.productsToolStripMenuItem_Click);
-            // 
-            // customersToolStripMenuItem
-            // 
-            this.customersToolStripMenuItem.Name = "customersToolStripMenuItem";
-            this.customersToolStripMenuItem.Size = new System.Drawing.Size(145, 22);
-            this.customersToolStripMenuItem.Text = "Customers";
-            this.customersToolStripMenuItem.Click += new System.EventHandler(this.customersToolStripMenuItem_Click);
-            // 
-            // transactionsToolStripMenuItem
-            // 
-            this.transactionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.advancesToolStripMenuItem,
-            this.paymentsToolStripMenuItem});
-            this.transactionsToolStripMenuItem.Name = "transactionsToolStripMenuItem";
-            this.transactionsToolStripMenuItem.Size = new System.Drawing.Size(86, 20);
-            this.transactionsToolStripMenuItem.Text = "Transactions";
-            // 
-            // advancesToolStripMenuItem
-            // 
-            this.advancesToolStripMenuItem.Name = "advancesToolStripMenuItem";
-            this.advancesToolStripMenuItem.Size = new System.Drawing.Size(170, 22);
-            this.advancesToolStripMenuItem.Text = "Received Advance";
-            this.advancesToolStripMenuItem.Click += new System.EventHandler(this.advancesToolStripMenuItem_Click);
-            // 
-            // paymentsToolStripMenuItem
-            // 
-            this.paymentsToolStripMenuItem.Name = "paymentsToolStripMenuItem";
-            this.paymentsToolStripMenuItem.Size = new System.Drawing.Size(170, 22);
-            this.paymentsToolStripMenuItem.Text = "Adjust Advance";
-            this.paymentsToolStripMenuItem.Click += new System.EventHandler(this.paymentsToolStripMenuItem_Click);
-            // 
-            // permissionsToolStripMenuItem
-            // 
-            this.permissionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.createNewUserToolStripMenuItem,
-            this.changePasswordToolStripMenuItem,
-            this.assignRolesToolStripMenuItem});
-            this.permissionsToolStripMenuItem.Name = "permissionsToolStripMenuItem";
-            this.permissionsToolStripMenuItem.Size = new System.Drawing.Size(82, 20);
-            this.permissionsToolStripMenuItem.Text = "Permissions";
-            // 
-            // createNewUserToolStripMenuItem
-            // 
-            this.createNewUserToolStripMenuItem.Name = "createNewUserToolStripMenuItem";
-            this.createNewUserToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
-            this.createNewUserToolStripMenuItem.Text = "Create New User";
-            this.createNewUserToolStripMenuItem.Click += new System.EventHandler(this.createNewUserToolStripMenuItem_Click);
-            // 
-            // changePasswordToolStripMenuItem
-            // 
-            this.changePasswordToolStripMenuItem.Name = "changePasswordToolStripMenuItem";
-            this.changePasswordToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
-            this.changePasswordToolStripMenuItem.Text = "Change Password";
-            this.changePasswordToolStripMenuItem.Click += new System.EventHandler(this.changePasswordToolStripMenuItem_Click);
-            // 
-            // assignRolesToolStripMenuItem
-            // 
-            this.assignRolesToolStripMenuItem.Name = "assignRolesToolStripMenuItem";
-            this.assignRolesToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
-            this.assignRolesToolStripMenuItem.Text = "Assign Roles";
-            this.assignRolesToolStripMenuItem.Click += new System.EventHandler(this.assignRolesToolStripMenuItem_Click);
-            // 
-            // reportsToolStripMenuItem
-            // 
-            this.reportsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.cashierCheckoutToolStripMenuItem1,
-            this.salesAnalysisToolStripMenuItem1,
-            this.viewLogToolStripMenuItem});
-            this.reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
-            this.reportsToolStripMenuItem.Size = new System.Drawing.Size(59, 20);
-            this.reportsToolStripMenuItem.Text = "Reports";
-            // 
-            // cashierCheckoutToolStripMenuItem1
-            // 
-            this.cashierCheckoutToolStripMenuItem1.Name = "cashierCheckoutToolStripMenuItem1";
-            this.cashierCheckoutToolStripMenuItem1.Size = new System.Drawing.Size(167, 22);
-            this.cashierCheckoutToolStripMenuItem1.Text = "Cashier Checkout";
-            this.cashierCheckoutToolStripMenuItem1.Click += new System.EventHandler(this.cashierCheckoutToolStripMenuItem1_Click);
-            // 
-            // salesAnalysisToolStripMenuItem1
-            // 
-            this.salesAnalysisToolStripMenuItem1.Name = "salesAnalysisToolStripMenuItem1";
-            this.salesAnalysisToolStripMenuItem1.Size = new System.Drawing.Size(167, 22);
-            this.salesAnalysisToolStripMenuItem1.Text = "Sales Analysis";
-            this.salesAnalysisToolStripMenuItem1.Click += new System.EventHandler(this.salesAnalysisToolStripMenuItem1_Click);
-            // 
-            // viewLogToolStripMenuItem
-            // 
-            this.viewLogToolStripMenuItem.Name = "viewLogToolStripMenuItem";
-            this.viewLogToolStripMenuItem.Size = new System.Drawing.Size(167, 22);
-            this.viewLogToolStripMenuItem.Text = "View Log";
-            this.viewLogToolStripMenuItem.Click += new System.EventHandler(this.viewLogToolStripMenuItem_Click);
-            // 
-            // exitToolStripMenuItem
-            // 
-            this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-            this.exitToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
-            this.exitToolStripMenuItem.Text = "Exit";
-            this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
-            // 
             // btnLogin
             // 
-            this.btnLogin.Location = new System.Drawing.Point(12, 27);
+            this.btnLogin.Location = new System.Drawing.Point(159, 3);
             this.btnLogin.Name = "btnLogin";
-            this.btnLogin.Size = new System.Drawing.Size(170, 85);
+            this.btnLogin.Size = new System.Drawing.Size(150, 100);
             this.btnLogin.TabIndex = 27;
             this.btnLogin.Text = "&Login";
             this.btnLogin.UseVisualStyleBackColor = true;
@@ -200,66 +58,188 @@
             // 
             // btnSale
             // 
-            this.btnSale.Location = new System.Drawing.Point(188, 27);
+            this.btnSale.Location = new System.Drawing.Point(315, 3);
             this.btnSale.Name = "btnSale";
-            this.btnSale.Size = new System.Drawing.Size(170, 85);
+            this.btnSale.Size = new System.Drawing.Size(150, 100);
             this.btnSale.TabIndex = 28;
             this.btnSale.Text = "&Sale";
             this.btnSale.UseVisualStyleBackColor = true;
             this.btnSale.Click += new System.EventHandler(this.btnSale_Click);
             // 
-            // button1
+            // btnInitial
             // 
-            this.button1.Location = new System.Drawing.Point(164, 204);
-            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(179, 66);
-            this.button1.TabIndex = 29;
-            this.button1.Text = "button1";
-            this.button1.UseVisualStyleBackColor = true;
-            this.button1.Click += new System.EventHandler(this.button1_Click);
+            this.btnInitial.Location = new System.Drawing.Point(3, 3);
+            this.btnInitial.Name = "btnInitial";
+            this.btnInitial.Size = new System.Drawing.Size(150, 100);
+            this.btnInitial.TabIndex = 29;
+            this.btnInitial.Text = "Initial Data";
+            this.btnInitial.UseVisualStyleBackColor = true;
+            this.btnInitial.Click += new System.EventHandler(this.btnInitial_Click);
+            // 
+            // flowLayoutPanel1
+            // 
+            this.flowLayoutPanel1.Controls.Add(this.btnInitial);
+            this.flowLayoutPanel1.Controls.Add(this.btnLogin);
+            this.flowLayoutPanel1.Controls.Add(this.btnSale);
+            this.flowLayoutPanel1.Controls.Add(this.btnProduct);
+            this.flowLayoutPanel1.Controls.Add(this.btnProductGroup);
+            this.flowLayoutPanel1.Controls.Add(this.btnCustomer);
+            this.flowLayoutPanel1.Controls.Add(this.btnAdvanceReceive);
+            this.flowLayoutPanel1.Controls.Add(this.btnAdvanceAdjust);
+            this.flowLayoutPanel1.Controls.Add(this.btnExit);
+            this.flowLayoutPanel1.Controls.Add(this.btnCreateUser);
+            this.flowLayoutPanel1.Controls.Add(this.btnAssignRoles);
+            this.flowLayoutPanel1.Controls.Add(this.btnChangePassword);
+            this.flowLayoutPanel1.Controls.Add(this.btnCashierCheckout);
+            this.flowLayoutPanel1.Controls.Add(this.btnSaleAnalysis);
+            this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(792, 537);
+            this.flowLayoutPanel1.TabIndex = 30;
+            // 
+            // btnProduct
+            // 
+            this.btnProduct.Location = new System.Drawing.Point(471, 3);
+            this.btnProduct.Name = "btnProduct";
+            this.btnProduct.Size = new System.Drawing.Size(150, 100);
+            this.btnProduct.TabIndex = 30;
+            this.btnProduct.Text = "Products";
+            this.btnProduct.UseVisualStyleBackColor = true;
+            this.btnProduct.Click += new System.EventHandler(this.btnProduct_Click);
+            // 
+            // btnProductGroup
+            // 
+            this.btnProductGroup.Location = new System.Drawing.Point(627, 3);
+            this.btnProductGroup.Name = "btnProductGroup";
+            this.btnProductGroup.Size = new System.Drawing.Size(150, 100);
+            this.btnProductGroup.TabIndex = 31;
+            this.btnProductGroup.Text = "Product Groups";
+            this.btnProductGroup.UseVisualStyleBackColor = true;
+            this.btnProductGroup.Click += new System.EventHandler(this.btnProductGroup_Click);
+            // 
+            // btnCustomer
+            // 
+            this.btnCustomer.Location = new System.Drawing.Point(3, 109);
+            this.btnCustomer.Name = "btnCustomer";
+            this.btnCustomer.Size = new System.Drawing.Size(150, 100);
+            this.btnCustomer.TabIndex = 32;
+            this.btnCustomer.Text = "Customers";
+            this.btnCustomer.UseVisualStyleBackColor = true;
+            this.btnCustomer.Click += new System.EventHandler(this.btnCustomer_Click);
+            // 
+            // btnAdvanceReceive
+            // 
+            this.btnAdvanceReceive.Location = new System.Drawing.Point(159, 109);
+            this.btnAdvanceReceive.Name = "btnAdvanceReceive";
+            this.btnAdvanceReceive.Size = new System.Drawing.Size(150, 100);
+            this.btnAdvanceReceive.TabIndex = 33;
+            this.btnAdvanceReceive.Text = "Receive Advance";
+            this.btnAdvanceReceive.UseVisualStyleBackColor = true;
+            this.btnAdvanceReceive.Click += new System.EventHandler(this.btnAdvanceReceive_Click);
+            // 
+            // btnAdvanceAdjust
+            // 
+            this.btnAdvanceAdjust.Location = new System.Drawing.Point(315, 109);
+            this.btnAdvanceAdjust.Name = "btnAdvanceAdjust";
+            this.btnAdvanceAdjust.Size = new System.Drawing.Size(150, 100);
+            this.btnAdvanceAdjust.TabIndex = 34;
+            this.btnAdvanceAdjust.Text = "Adjust Advance";
+            this.btnAdvanceAdjust.UseVisualStyleBackColor = true;
+            this.btnAdvanceAdjust.Click += new System.EventHandler(this.btnAdvanceAdjust_Click);
+            // 
+            // btnExit
+            // 
+            this.btnExit.Location = new System.Drawing.Point(471, 109);
+            this.btnExit.Name = "btnExit";
+            this.btnExit.Size = new System.Drawing.Size(150, 100);
+            this.btnExit.TabIndex = 35;
+            this.btnExit.Text = "Exit";
+            this.btnExit.UseVisualStyleBackColor = true;
+            this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
+            // 
+            // btnCreateUser
+            // 
+            this.btnCreateUser.Location = new System.Drawing.Point(627, 109);
+            this.btnCreateUser.Name = "btnCreateUser";
+            this.btnCreateUser.Size = new System.Drawing.Size(150, 100);
+            this.btnCreateUser.TabIndex = 36;
+            this.btnCreateUser.Text = "Create User";
+            this.btnCreateUser.UseVisualStyleBackColor = true;
+            this.btnCreateUser.Click += new System.EventHandler(this.btnCreateUser_Click);
+            // 
+            // btnAssignRoles
+            // 
+            this.btnAssignRoles.Location = new System.Drawing.Point(3, 215);
+            this.btnAssignRoles.Name = "btnAssignRoles";
+            this.btnAssignRoles.Size = new System.Drawing.Size(150, 100);
+            this.btnAssignRoles.TabIndex = 37;
+            this.btnAssignRoles.Text = "Assign Roles";
+            this.btnAssignRoles.UseVisualStyleBackColor = true;
+            this.btnAssignRoles.Click += new System.EventHandler(this.btnAssignRoles_Click);
+            // 
+            // btnChangePassword
+            // 
+            this.btnChangePassword.Location = new System.Drawing.Point(159, 215);
+            this.btnChangePassword.Name = "btnChangePassword";
+            this.btnChangePassword.Size = new System.Drawing.Size(150, 100);
+            this.btnChangePassword.TabIndex = 38;
+            this.btnChangePassword.Text = "Change Password";
+            this.btnChangePassword.UseVisualStyleBackColor = true;
+            this.btnChangePassword.Click += new System.EventHandler(this.btnChangePassword_Click);
+            // 
+            // btnCashierCheckout
+            // 
+            this.btnCashierCheckout.Location = new System.Drawing.Point(315, 215);
+            this.btnCashierCheckout.Name = "btnCashierCheckout";
+            this.btnCashierCheckout.Size = new System.Drawing.Size(150, 100);
+            this.btnCashierCheckout.TabIndex = 39;
+            this.btnCashierCheckout.Text = "Cashier Checkout";
+            this.btnCashierCheckout.UseVisualStyleBackColor = true;
+            this.btnCashierCheckout.Click += new System.EventHandler(this.btnCashierCheckout_Click);
+            // 
+            // btnSaleAnalysis
+            // 
+            this.btnSaleAnalysis.Location = new System.Drawing.Point(471, 215);
+            this.btnSaleAnalysis.Name = "btnSaleAnalysis";
+            this.btnSaleAnalysis.Size = new System.Drawing.Size(150, 100);
+            this.btnSaleAnalysis.TabIndex = 40;
+            this.btnSaleAnalysis.Text = "Sale Analysis";
+            this.btnSaleAnalysis.UseVisualStyleBackColor = true;
+            this.btnSaleAnalysis.Click += new System.EventHandler(this.btnSaleAnalysis_Click);
             // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(792, 537);
-            this.Controls.Add(this.button1);
-            this.Controls.Add(this.btnSale);
-            this.Controls.Add(this.btnLogin);
-            this.Controls.Add(this.menuStrip1);
-            this.MainMenuStrip = this.menuStrip1;
+            this.Controls.Add(this.flowLayoutPanel1);
             this.Name = "MainForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "MainForm";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
-            this.menuStrip1.ResumeLayout(false);
-            this.menuStrip1.PerformLayout();
+            this.Load += new System.EventHandler(this.MainForm_Load);
+            this.flowLayoutPanel1.ResumeLayout(false);
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
         #endregion
 
-        private System.Windows.Forms.MenuStrip menuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem masterToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem transactionsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem permissionsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem advancesToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem paymentsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem createNewUserToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem changePasswordToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem assignRolesToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem reportsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem productsToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem customersToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem salesAnalysisToolStripMenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem cashierCheckoutToolStripMenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem prToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem viewLogToolStripMenuItem;
         private System.Windows.Forms.Button btnLogin;
         private System.Windows.Forms.Button btnSale;
-        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Button btnInitial;
+        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+        private System.Windows.Forms.Button btnProduct;
+        private System.Windows.Forms.Button btnProductGroup;
+        private System.Windows.Forms.Button btnCustomer;
+        private System.Windows.Forms.Button btnAdvanceReceive;
+        private System.Windows.Forms.Button btnAdvanceAdjust;
+        private System.Windows.Forms.Button btnExit;
+        private System.Windows.Forms.Button btnCreateUser;
+        private System.Windows.Forms.Button btnAssignRoles;
+        private System.Windows.Forms.Button btnChangePassword;
+        private System.Windows.Forms.Button btnCashierCheckout;
+        private System.Windows.Forms.Button btnSaleAnalysis;
     }
 }
\ No newline at end of file
diff --git a/Tanshu.Accounts.PointOfSale/MainForm.resx b/Tanshu.Accounts.PointOfSale/MainForm.resx
index 541af56..19dc0dd 100644
--- a/Tanshu.Accounts.PointOfSale/MainForm.resx
+++ b/Tanshu.Accounts.PointOfSale/MainForm.resx
@@ -117,7 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
 </root>
\ No newline at end of file
diff --git a/Tanshu.Accounts.PointOfSale/Products/ProductsForm.Designer.cs b/Tanshu.Accounts.PointOfSale/Products/ProductsForm.Designer.cs
index ead65a1..8f95853 100644
--- a/Tanshu.Accounts.PointOfSale/Products/ProductsForm.Designer.cs
+++ b/Tanshu.Accounts.PointOfSale/Products/ProductsForm.Designer.cs
@@ -53,10 +53,6 @@
             this.btnDelete = new System.Windows.Forms.Button();
             this.btnUpdate = new System.Windows.Forms.Button();
             this.btnExit = new System.Windows.Forms.Button();
-            this.txtMinimumLevel = new System.Windows.Forms.TextBox();
-            this.label6 = new System.Windows.Forms.Label();
-            this.txtMaximumLevel = new System.Windows.Forms.TextBox();
-            this.label9 = new System.Windows.Forms.Label();
             this.chkDiscontinued = new System.Windows.Forms.CheckBox();
             this.cmbSalesLedger = new System.Windows.Forms.ComboBox();
             this.label5 = new System.Windows.Forms.Label();
@@ -295,49 +291,11 @@
             this.btnExit.Text = "E&xit";
             this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
             // 
-            // txtMinimumLevel
-            // 
-            this.txtMinimumLevel.AccessibleName = "Phone 1";
-            this.txtMinimumLevel.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsProducts, "MinimumLevel", true));
-            this.txtMinimumLevel.Location = new System.Drawing.Point(10, 264);
-            this.txtMinimumLevel.Name = "txtMinimumLevel";
-            this.txtMinimumLevel.Size = new System.Drawing.Size(77, 20);
-            this.txtMinimumLevel.TabIndex = 75;
-            this.txtMinimumLevel.Text = "0";
-            // 
-            // label6
-            // 
-            this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(10, 248);
-            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(77, 13);
-            this.label6.TabIndex = 74;
-            this.label6.Text = "Minimum Level";
-            // 
-            // txtMaximumLevel
-            // 
-            this.txtMaximumLevel.AccessibleName = "Phone 1";
-            this.txtMaximumLevel.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsProducts, "MaximumLevel", true));
-            this.txtMaximumLevel.Location = new System.Drawing.Point(96, 264);
-            this.txtMaximumLevel.Name = "txtMaximumLevel";
-            this.txtMaximumLevel.Size = new System.Drawing.Size(85, 20);
-            this.txtMaximumLevel.TabIndex = 77;
-            this.txtMaximumLevel.Text = "0";
-            // 
-            // label9
-            // 
-            this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(93, 249);
-            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(80, 13);
-            this.label9.TabIndex = 76;
-            this.label9.Text = "Maximum Level";
-            // 
             // chkDiscontinued
             // 
             this.chkDiscontinued.AutoSize = true;
             this.chkDiscontinued.DataBindings.Add(new System.Windows.Forms.Binding("Checked", this.bsProducts, "Discontinued", true));
-            this.chkDiscontinued.Location = new System.Drawing.Point(233, 272);
+            this.chkDiscontinued.Location = new System.Drawing.Point(236, 190);
             this.chkDiscontinued.Name = "chkDiscontinued";
             this.chkDiscontinued.Size = new System.Drawing.Size(88, 17);
             this.chkDiscontinued.TabIndex = 78;
@@ -347,6 +305,7 @@
             // cmbSalesLedger
             // 
             this.cmbSalesLedger.DataBindings.Add(new System.Windows.Forms.Binding("SelectedValue", this.bsProducts, "SaleLedgerID", true));
+            this.cmbSalesLedger.DisplayMember = "LedgerID";
             this.cmbSalesLedger.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbSalesLedger.Location = new System.Drawing.Point(93, 163);
             this.cmbSalesLedger.Name = "cmbSalesLedger";
@@ -399,10 +358,6 @@
             this.Controls.Add(this.cmbSalesLedger);
             this.Controls.Add(this.label5);
             this.Controls.Add(this.chkDiscontinued);
-            this.Controls.Add(this.txtMaximumLevel);
-            this.Controls.Add(this.label9);
-            this.Controls.Add(this.txtMinimumLevel);
-            this.Controls.Add(this.label6);
             this.Controls.Add(this.btnAdd);
             this.Controls.Add(this.btnDelete);
             this.Controls.Add(this.btnUpdate);
@@ -456,10 +411,6 @@
         internal System.Windows.Forms.Button btnDelete;
         internal System.Windows.Forms.Button btnUpdate;
         internal System.Windows.Forms.Button btnExit;
-        internal System.Windows.Forms.TextBox txtMinimumLevel;
-        internal System.Windows.Forms.Label label6;
-        internal System.Windows.Forms.TextBox txtMaximumLevel;
-        internal System.Windows.Forms.Label label9;
         private System.Windows.Forms.CheckBox chkDiscontinued;
         internal System.Windows.Forms.ComboBox cmbSalesLedger;
         internal System.Windows.Forms.Label label5;
diff --git a/Tanshu.Accounts.PointOfSale/Products/ProductsForm.cs b/Tanshu.Accounts.PointOfSale/Products/ProductsForm.cs
index c184322..765c11a 100644
--- a/Tanshu.Accounts.PointOfSale/Products/ProductsForm.cs
+++ b/Tanshu.Accounts.PointOfSale/Products/ProductsForm.cs
@@ -144,8 +144,6 @@ namespace Tanshu.Accounts.PointOfSale
             if (!addNew)
                 product = ProductBI.GetProduct(productList.ElementAt(bsProducts.Position).ProductID);
             product.Name = txtName.Text;
-            product.MinimumLevel = Convert.ToDecimal(txtMinimumLevel.Text);
-            product.MaximumLevel = Convert.ToDecimal(txtMaximumLevel.Text);
             product.Units = cmbUnits.Text;
             product.ProductGroup = new ProductGroupBI().GetProductGroup((int)cmbProductTypes.SelectedValue);
             product.SalePrice = Convert.ToDecimal(txtSalePrice.Text);
diff --git a/Tanshu.Accounts.PointOfSale/Products/ProductsForm.resx b/Tanshu.Accounts.PointOfSale/Products/ProductsForm.resx
index e7bc114..aa82615 100644
--- a/Tanshu.Accounts.PointOfSale/Products/ProductsForm.resx
+++ b/Tanshu.Accounts.PointOfSale/Products/ProductsForm.resx
@@ -120,12 +120,24 @@
   <metadata name="bsProducts.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="bsProducts.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="bsTypes.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>251, 17</value>
+  </metadata>
   <metadata name="bsTypes.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>251, 17</value>
   </metadata>
   <metadata name="bsUnits.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>123, 17</value>
   </metadata>
+  <metadata name="bsUnits.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>123, 17</value>
+  </metadata>
+  <metadata name="bsSalesTax.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>145, 54</value>
+  </metadata>
   <metadata name="bsSalesTax.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>145, 54</value>
   </metadata>
diff --git a/Tanshu.Accounts.PointOfSale/Sales/CheckoutForm.Designer.cs b/Tanshu.Accounts.PointOfSale/Reports/CheckoutForm.Designer.cs
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/CheckoutForm.Designer.cs
rename to Tanshu.Accounts.PointOfSale/Reports/CheckoutForm.Designer.cs
diff --git a/Tanshu.Accounts.PointOfSale/Sales/CheckoutForm.cs b/Tanshu.Accounts.PointOfSale/Reports/CheckoutForm.cs
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/CheckoutForm.cs
rename to Tanshu.Accounts.PointOfSale/Reports/CheckoutForm.cs
diff --git a/Tanshu.Accounts.PointOfSale/Sales/CheckoutForm.resx b/Tanshu.Accounts.PointOfSale/Reports/CheckoutForm.resx
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/CheckoutForm.resx
rename to Tanshu.Accounts.PointOfSale/Reports/CheckoutForm.resx
diff --git a/Tanshu.Accounts.PointOfSale/Sales/SaleAnalysisForm.cs b/Tanshu.Accounts.PointOfSale/Reports/SaleAnalysisForm.cs
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/SaleAnalysisForm.cs
rename to Tanshu.Accounts.PointOfSale/Reports/SaleAnalysisForm.cs
diff --git a/Tanshu.Accounts.PointOfSale/Sales/SaleAnalysisForm.designer.cs b/Tanshu.Accounts.PointOfSale/Reports/SaleAnalysisForm.designer.cs
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/SaleAnalysisForm.designer.cs
rename to Tanshu.Accounts.PointOfSale/Reports/SaleAnalysisForm.designer.cs
diff --git a/Tanshu.Accounts.PointOfSale/Sales/SaleAnalysisForm.resx b/Tanshu.Accounts.PointOfSale/Reports/SaleAnalysisForm.resx
similarity index 100%
rename from Tanshu.Accounts.PointOfSale/Sales/SaleAnalysisForm.resx
rename to Tanshu.Accounts.PointOfSale/Reports/SaleAnalysisForm.resx
diff --git a/Tanshu.Accounts.PointOfSale/Sales/BillHelperFunctions.cs b/Tanshu.Accounts.PointOfSale/Sales/BillHelperFunctions.cs
index 53e86f8..b095030 100644
--- a/Tanshu.Accounts.PointOfSale/Sales/BillHelperFunctions.cs
+++ b/Tanshu.Accounts.PointOfSale/Sales/BillHelperFunctions.cs
@@ -19,7 +19,7 @@ namespace Tanshu.Accounts.PointOfSale
             #region InputBox
             if (discount == -1)
             {
-                InputBoxResult result = InputBox.Show("Discount Rate", "Discount", "0", InputBox_Validating);
+                InputBoxResult result = InputBox.Show("Discount", "0", InputBox_Validating);
                 if (result.OK)
                 {
                     if (!decimal.TryParse(result.Text, out discount))
@@ -32,7 +32,7 @@ namespace Tanshu.Accounts.PointOfSale
             #endregion
 
             #region Max Discount
-            decimal maxDiscount = new SaleVoucherBI().GetProductDiscountLimit(productID);
+            decimal maxDiscount = SaleVoucherBI.GetProductDiscountLimit(productID);
             if ((discount > maxDiscount) && customer.CustomerID != 1)
             {
                 MessageBox.Show(string.Format("Maximum discount for this product is {0:P}", maxDiscount), "Excessive Discount", MessageBoxButtons.OK, MessageBoxIcon.Warning);
@@ -59,7 +59,7 @@ namespace Tanshu.Accounts.PointOfSale
         public static BillInventory AddProductToGrid(int productID, BindingSource bindingSource, OrderedDictionary<BillItemKey, BillInventory> bill)
         {
             BillInventory product;
-            if ((!bill.ContainsKey(new BillItemKey(productID, true))) && (!bill.ContainsKey(new BillItemKey(productID, false))))
+            if ((!bill.ContainsKey(new BillItemKey(productID, false))) && (!bill.ContainsKey(new BillItemKey(productID, true))))
             {
                 //No new or old
                 product = AddNewProduct(productID, bindingSource, bill);
@@ -106,7 +106,7 @@ namespace Tanshu.Accounts.PointOfSale
         private static BillInventory AddNewProduct(int productID, BindingSource bindingSource, OrderedDictionary<BillItemKey, BillInventory> bill)
         {
             BillItemKey key = new BillItemKey(productID, true);
-            BillInventory product = new SaleVoucherBI().GetDefaultSaleBillItem(productID);
+            BillInventory product = SaleVoucherBI.GetDefaultSaleBillItem(productID);
             product.Quantity = 1;
             bill.Add(key, product);
             bindingSource.DataSource = bill.Values;
@@ -131,7 +131,7 @@ namespace Tanshu.Accounts.PointOfSale
             #region Prompt
             if (prompt)
             {
-                InputBoxResult result = InputBox.Show("Enter Quantity", "Quantity", (product.Quantity + 1).ToString(), InputBox_Validating);
+                InputBoxResult result = InputBox.Show("Quantity", (product.Quantity + 1).ToString(), InputBox_Validating);
                 if (result.OK)
                 {
                     if (!decimal.TryParse(result.Text, out quantity))
@@ -206,7 +206,7 @@ namespace Tanshu.Accounts.PointOfSale
         {
             if (amount == -1)
             {
-                InputBoxResult result = InputBox.Show("Enter Amount", "Amount", (product.Value).ToString(), InputBox_Validating);
+                InputBoxResult result = InputBox.Show("Amount", (product.Value).ToString(), InputBox_Validating);
                 if (result.OK)
                 {
                     amount = Convert.ToDecimal(result.Text);
diff --git a/Tanshu.Accounts.PointOfSale/Sales/DiscountForm.Designer.cs b/Tanshu.Accounts.PointOfSale/Sales/DiscountForm.Designer.cs
new file mode 100644
index 0000000..dad31fc
--- /dev/null
+++ b/Tanshu.Accounts.PointOfSale/Sales/DiscountForm.Designer.cs
@@ -0,0 +1,111 @@
+namespace Tanshu.Accounts.PointOfSale
+{
+    partial class DiscountForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.numpadControl1 = new Tanshu.Common.KeyboardControl.NumpadControl();
+            this.txtAmount = new System.Windows.Forms.TextBox();
+            this.flpModifier = new System.Windows.Forms.FlowLayoutPanel();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.numpadControl1);
+            this.splitContainer1.Panel1.Controls.Add(this.txtAmount);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.flpModifier);
+            this.splitContainer1.Size = new System.Drawing.Size(619, 492);
+            this.splitContainer1.SplitterDistance = 230;
+            this.splitContainer1.TabIndex = 2;
+            // 
+            // numpadControl1
+            // 
+            this.numpadControl1.Location = new System.Drawing.Point(3, 29);
+            this.numpadControl1.Name = "numpadControl1";
+            this.numpadControl1.Size = new System.Drawing.Size(224, 224);
+            this.numpadControl1.TabIndex = 1;
+            // 
+            // txtAmount
+            // 
+            this.txtAmount.Location = new System.Drawing.Point(3, 3);
+            this.txtAmount.Name = "txtAmount";
+            this.txtAmount.Size = new System.Drawing.Size(224, 20);
+            this.txtAmount.TabIndex = 0;
+            this.txtAmount.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAmount_KeyDown);
+            // 
+            // flpModifier
+            // 
+            this.flpModifier.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.flpModifier.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.flpModifier.Location = new System.Drawing.Point(0, 0);
+            this.flpModifier.Name = "flpModifier";
+            this.flpModifier.Size = new System.Drawing.Size(385, 492);
+            this.flpModifier.TabIndex = 6;
+            // 
+            // DiscountForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(619, 492);
+            this.ControlBox = false;
+            this.Controls.Add(this.splitContainer1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.Name = "DiscountForm";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Discount";
+            this.Load += new System.EventHandler(this.DiscountForm_Load);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel1.PerformLayout();
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            this.splitContainer1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private Tanshu.Common.KeyboardControl.NumpadControl numpadControl1;
+        private System.Windows.Forms.TextBox txtAmount;
+        private System.Windows.Forms.FlowLayoutPanel flpModifier;
+
+    }
+}
\ No newline at end of file
diff --git a/Tanshu.Accounts.PointOfSale/Sales/DiscountForm.cs b/Tanshu.Accounts.PointOfSale/Sales/DiscountForm.cs
new file mode 100644
index 0000000..b216341
--- /dev/null
+++ b/Tanshu.Accounts.PointOfSale/Sales/DiscountForm.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using Tanshu.Accounts.Entities;
+using Tanshu.Accounts.Contracts;
+using Tanshu.Accounts.SqlDAO;
+using Tanshu.Accounts.Helpers;
+using Tanshu.Common.KeyboardControl;
+
+namespace Tanshu.Accounts.PointOfSale
+{
+    public partial class DiscountForm : Form
+    {
+        private IList<ProductGroup> source;
+        private IList<UnselectableCheckbox> list;
+        private IList<int> selection;
+        decimal discount;
+        public DiscountForm(IList<ProductGroup> source)
+        {
+            InitializeComponent();
+            this.source = source;
+            list = new List<UnselectableCheckbox>();
+            selection = new List<int>();
+        }
+
+        private void button_Click(object sender, EventArgs e)
+        {
+            CheckBox button = sender as CheckBox;
+            if (button == null)
+                return;
+            var pg = (ProductGroup)button.Tag;
+            if (button.CheckState == CheckState.Checked)
+                selection.Add(pg.ProductGroupID);
+            else
+                selection.Remove(pg.ProductGroupID);
+        }
+        public decimal Selection(out IList<int> list)
+        {
+            list = selection;
+            return discount;
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            this.Close();
+        }
+
+        private void DiscountForm_Load(object sender, EventArgs e)
+        {
+            ControlFactory.GenerateGroups(ref flpModifier, ref list, new Point(75, 75), source, new ButtonClickDelegate(button_Click));
+        }
+
+        private void txtAmount_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Return && decimal.TryParse(txtAmount.Text, out discount) && discount >= 0 && discount <= 100)
+            {
+                this.DialogResult = DialogResult.OK;
+                this.Close();
+            }
+            else if (e.KeyCode == Keys.Escape)
+            {
+                this.DialogResult = DialogResult.Cancel;
+                this.Close();
+            }
+        }
+
+    }
+}
diff --git a/Tanshu.Common.KeyboardControl/NumpadControl.resx b/Tanshu.Accounts.PointOfSale/Sales/DiscountForm.resx
similarity index 100%
rename from Tanshu.Common.KeyboardControl/NumpadControl.resx
rename to Tanshu.Accounts.PointOfSale/Sales/DiscountForm.resx
diff --git a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.Designer.cs b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.Designer.cs
index e4ea45d..c906b21 100644
--- a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.Designer.cs
+++ b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.Designer.cs
@@ -29,8 +29,9 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label7 = new System.Windows.Forms.Label();
             this.txtDiscount = new System.Windows.Forms.TextBox();
             this.Label12 = new System.Windows.Forms.Label();
@@ -41,21 +42,22 @@
             this.txtGrossTax = new System.Windows.Forms.TextBox();
             this.dgvProducts = new System.Windows.Forms.DataGridView();
             this.Display = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.printedDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.additionalDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.bindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.pnlBilling = new System.Windows.Forms.Panel();
+            this.flpMain = new System.Windows.Forms.FlowLayoutPanel();
+            this.flpGroup = new System.Windows.Forms.FlowLayoutPanel();
+            this.flpActions = new System.Windows.Forms.FlowLayoutPanel();
+            this.btnQuantity = new System.Windows.Forms.Button();
+            this.btnRate = new System.Windows.Forms.Button();
+            this.btnDiscount = new System.Windows.Forms.Button();
+            this.btnModifier = new System.Windows.Forms.Button();
+            this.btnWaiter = new System.Windows.Forms.Button();
+            this.btnPrintKot = new System.Windows.Forms.Button();
+            this.btnPrintBill = new System.Windows.Forms.Button();
+            this.btnClear = new System.Windows.Forms.Button();
+            this.btnVoid = new System.Windows.Forms.Button();
             this.btnSettle = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.txtServiceCharge = new System.Windows.Forms.TextBox();
-            this.btnWaiter = new System.Windows.Forms.Button();
-            this.btnClear = new System.Windows.Forms.Button();
-            this.btnRate = new System.Windows.Forms.Button();
-            this.btnPrintKot = new System.Windows.Forms.Button();
-            this.btnPrintBill = new System.Windows.Forms.Button();
-            this.btnVoid = new System.Windows.Forms.Button();
-            this.btnDiscount = new System.Windows.Forms.Button();
-            this.btnQuantity = new System.Windows.Forms.Button();
             this.txtTableID = new System.Windows.Forms.TextBox();
             this.label11 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
@@ -69,18 +71,18 @@
             this.txtBillID = new System.Windows.Forms.TextBox();
             this.txtKotID = new System.Windows.Forms.TextBox();
             this.btnCustomer = new System.Windows.Forms.Button();
+            this.printedDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.additionalDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.bindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.bsWaiter = new System.Windows.Forms.BindingSource(this.components);
             this.bsPending = new System.Windows.Forms.BindingSource(this.components);
-            this.btnModifier = new System.Windows.Forms.Button();
-            this.flpActions = new System.Windows.Forms.FlowLayoutPanel();
-            this.flpGroup = new System.Windows.Forms.FlowLayoutPanel();
-            this.flpMain = new System.Windows.Forms.FlowLayoutPanel();
+            this.btnDelete = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dgvProducts)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();
             this.pnlBilling.SuspendLayout();
+            this.flpActions.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsWaiter)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsPending)).BeginInit();
-            this.flpActions.SuspendLayout();
             this.SuspendLayout();
             // 
             // label7
@@ -183,6 +185,7 @@
                         | System.Windows.Forms.AnchorStyles.Right)));
             this.dgvProducts.AutoGenerateColumns = false;
             this.dgvProducts.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCellsExceptHeader;
+            this.dgvProducts.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCellsExceptHeaders;
             this.dgvProducts.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvProducts.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.Display,
@@ -204,36 +207,13 @@
             // Display
             // 
             this.Display.DataPropertyName = "Display";
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.Display.DefaultCellStyle = dataGridViewCellStyle1;
             this.Display.HeaderText = "Display";
             this.Display.Name = "Display";
             this.Display.ReadOnly = true;
             this.Display.Width = 5;
             // 
-            // printedDataGridViewTextBoxColumn
-            // 
-            this.printedDataGridViewTextBoxColumn.DataPropertyName = "Printed";
-            dataGridViewCellStyle5.Format = "N2";
-            this.printedDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5;
-            this.printedDataGridViewTextBoxColumn.HeaderText = "Printed";
-            this.printedDataGridViewTextBoxColumn.Name = "printedDataGridViewTextBoxColumn";
-            this.printedDataGridViewTextBoxColumn.ReadOnly = true;
-            this.printedDataGridViewTextBoxColumn.Width = 5;
-            // 
-            // additionalDataGridViewTextBoxColumn
-            // 
-            this.additionalDataGridViewTextBoxColumn.DataPropertyName = "Additional";
-            dataGridViewCellStyle6.Format = "N2";
-            dataGridViewCellStyle6.NullValue = null;
-            this.additionalDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6;
-            this.additionalDataGridViewTextBoxColumn.HeaderText = "Additional";
-            this.additionalDataGridViewTextBoxColumn.Name = "additionalDataGridViewTextBoxColumn";
-            this.additionalDataGridViewTextBoxColumn.ReadOnly = true;
-            this.additionalDataGridViewTextBoxColumn.Width = 5;
-            // 
-            // bindingSource
-            // 
-            this.bindingSource.DataSource = typeof(Tanshu.Accounts.Contracts.BillInventory);
-            // 
             // pnlBilling
             // 
             this.pnlBilling.AutoSize = true;
@@ -271,9 +251,136 @@
             this.pnlBilling.Size = new System.Drawing.Size(982, 688);
             this.pnlBilling.TabIndex = 121;
             // 
+            // flpMain
+            // 
+            this.flpMain.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+                        | System.Windows.Forms.AnchorStyles.Left)
+                        | System.Windows.Forms.AnchorStyles.Right)));
+            this.flpMain.Location = new System.Drawing.Point(390, 54);
+            this.flpMain.Name = "flpMain";
+            this.flpMain.Size = new System.Drawing.Size(511, 552);
+            this.flpMain.TabIndex = 159;
+            // 
+            // flpGroup
+            // 
+            this.flpGroup.Dock = System.Windows.Forms.DockStyle.Right;
+            this.flpGroup.Location = new System.Drawing.Point(901, 0);
+            this.flpGroup.Name = "flpGroup";
+            this.flpGroup.Size = new System.Drawing.Size(81, 607);
+            this.flpGroup.TabIndex = 158;
+            // 
+            // flpActions
+            // 
+            this.flpActions.Controls.Add(this.btnQuantity);
+            this.flpActions.Controls.Add(this.btnRate);
+            this.flpActions.Controls.Add(this.btnDelete);
+            this.flpActions.Controls.Add(this.btnDiscount);
+            this.flpActions.Controls.Add(this.btnModifier);
+            this.flpActions.Controls.Add(this.btnWaiter);
+            this.flpActions.Controls.Add(this.btnPrintKot);
+            this.flpActions.Controls.Add(this.btnPrintBill);
+            this.flpActions.Controls.Add(this.btnClear);
+            this.flpActions.Controls.Add(this.btnVoid);
+            this.flpActions.Controls.Add(this.btnSettle);
+            this.flpActions.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.flpActions.Location = new System.Drawing.Point(0, 607);
+            this.flpActions.Name = "flpActions";
+            this.flpActions.Size = new System.Drawing.Size(982, 81);
+            this.flpActions.TabIndex = 157;
+            // 
+            // btnQuantity
+            // 
+            this.btnQuantity.Location = new System.Drawing.Point(3, 3);
+            this.btnQuantity.Name = "btnQuantity";
+            this.btnQuantity.Size = new System.Drawing.Size(75, 75);
+            this.btnQuantity.TabIndex = 141;
+            this.btnQuantity.Text = "Quantity - F2";
+            this.btnQuantity.UseVisualStyleBackColor = true;
+            this.btnQuantity.Click += new System.EventHandler(this.btnQuantity_Click);
+            // 
+            // btnRate
+            // 
+            this.btnRate.Location = new System.Drawing.Point(84, 3);
+            this.btnRate.Name = "btnRate";
+            this.btnRate.Size = new System.Drawing.Size(75, 75);
+            this.btnRate.TabIndex = 146;
+            this.btnRate.Text = "&Rate";
+            this.btnRate.UseVisualStyleBackColor = true;
+            this.btnRate.Click += new System.EventHandler(this.btnRate_Click);
+            // 
+            // btnDiscount
+            // 
+            this.btnDiscount.Location = new System.Drawing.Point(246, 3);
+            this.btnDiscount.Name = "btnDiscount";
+            this.btnDiscount.Size = new System.Drawing.Size(75, 75);
+            this.btnDiscount.TabIndex = 142;
+            this.btnDiscount.Text = "Discount - F3";
+            this.btnDiscount.UseVisualStyleBackColor = true;
+            this.btnDiscount.Click += new System.EventHandler(this.btnDiscount_Click);
+            // 
+            // btnModifier
+            // 
+            this.btnModifier.Location = new System.Drawing.Point(327, 3);
+            this.btnModifier.Name = "btnModifier";
+            this.btnModifier.Size = new System.Drawing.Size(75, 75);
+            this.btnModifier.TabIndex = 156;
+            this.btnModifier.Text = "Modifier";
+            this.btnModifier.UseVisualStyleBackColor = true;
+            this.btnModifier.Click += new System.EventHandler(this.btnModifier_Click);
+            // 
+            // btnWaiter
+            // 
+            this.btnWaiter.Location = new System.Drawing.Point(408, 3);
+            this.btnWaiter.Name = "btnWaiter";
+            this.btnWaiter.Size = new System.Drawing.Size(75, 75);
+            this.btnWaiter.TabIndex = 150;
+            this.btnWaiter.Text = "Select Waiter - F5";
+            this.btnWaiter.UseVisualStyleBackColor = true;
+            this.btnWaiter.Click += new System.EventHandler(this.btnWaiter_Click);
+            // 
+            // btnPrintKot
+            // 
+            this.btnPrintKot.Location = new System.Drawing.Point(489, 3);
+            this.btnPrintKot.Name = "btnPrintKot";
+            this.btnPrintKot.Size = new System.Drawing.Size(75, 75);
+            this.btnPrintKot.TabIndex = 145;
+            this.btnPrintKot.Text = "Print KOT - F12";
+            this.btnPrintKot.UseVisualStyleBackColor = true;
+            this.btnPrintKot.Click += new System.EventHandler(this.btnPrintKot_Click);
+            // 
+            // btnPrintBill
+            // 
+            this.btnPrintBill.Location = new System.Drawing.Point(570, 3);
+            this.btnPrintBill.Name = "btnPrintBill";
+            this.btnPrintBill.Size = new System.Drawing.Size(75, 75);
+            this.btnPrintBill.TabIndex = 144;
+            this.btnPrintBill.Text = "Print Bill - F11";
+            this.btnPrintBill.UseVisualStyleBackColor = true;
+            this.btnPrintBill.Click += new System.EventHandler(this.btnPrintBill_Click);
+            // 
+            // btnClear
+            // 
+            this.btnClear.Location = new System.Drawing.Point(651, 3);
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Size = new System.Drawing.Size(75, 75);
+            this.btnClear.TabIndex = 148;
+            this.btnClear.Text = "Clear - Esc";
+            this.btnClear.UseVisualStyleBackColor = true;
+            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
+            // 
+            // btnVoid
+            // 
+            this.btnVoid.Location = new System.Drawing.Point(732, 3);
+            this.btnVoid.Name = "btnVoid";
+            this.btnVoid.Size = new System.Drawing.Size(75, 75);
+            this.btnVoid.TabIndex = 143;
+            this.btnVoid.Text = "Void Bill";
+            this.btnVoid.UseVisualStyleBackColor = true;
+            this.btnVoid.Click += new System.EventHandler(this.btnVoid_Click);
+            // 
             // btnSettle
             // 
-            this.btnSettle.Location = new System.Drawing.Point(732, 3);
+            this.btnSettle.Location = new System.Drawing.Point(813, 3);
             this.btnSettle.Name = "btnSettle";
             this.btnSettle.Size = new System.Drawing.Size(75, 75);
             this.btnSettle.TabIndex = 155;
@@ -302,86 +409,6 @@
             this.txtServiceCharge.TabIndex = 153;
             this.txtServiceCharge.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             // 
-            // btnWaiter
-            // 
-            this.btnWaiter.Location = new System.Drawing.Point(327, 3);
-            this.btnWaiter.Name = "btnWaiter";
-            this.btnWaiter.Size = new System.Drawing.Size(75, 75);
-            this.btnWaiter.TabIndex = 150;
-            this.btnWaiter.Text = "Select Waiter - F5";
-            this.btnWaiter.UseVisualStyleBackColor = true;
-            this.btnWaiter.Click += new System.EventHandler(this.btnWaiter_Click);
-            // 
-            // btnClear
-            // 
-            this.btnClear.Location = new System.Drawing.Point(570, 3);
-            this.btnClear.Name = "btnClear";
-            this.btnClear.Size = new System.Drawing.Size(75, 75);
-            this.btnClear.TabIndex = 148;
-            this.btnClear.Text = "Clear - Esc";
-            this.btnClear.UseVisualStyleBackColor = true;
-            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
-            // 
-            // btnRate
-            // 
-            this.btnRate.Location = new System.Drawing.Point(84, 3);
-            this.btnRate.Name = "btnRate";
-            this.btnRate.Size = new System.Drawing.Size(75, 75);
-            this.btnRate.TabIndex = 146;
-            this.btnRate.Text = "&Rate";
-            this.btnRate.UseVisualStyleBackColor = true;
-            this.btnRate.Click += new System.EventHandler(this.btnRate_Click);
-            // 
-            // btnPrintKot
-            // 
-            this.btnPrintKot.Location = new System.Drawing.Point(408, 3);
-            this.btnPrintKot.Name = "btnPrintKot";
-            this.btnPrintKot.Size = new System.Drawing.Size(75, 75);
-            this.btnPrintKot.TabIndex = 145;
-            this.btnPrintKot.Text = "Print KOT - F12";
-            this.btnPrintKot.UseVisualStyleBackColor = true;
-            this.btnPrintKot.Click += new System.EventHandler(this.btnPrintKot_Click);
-            // 
-            // btnPrintBill
-            // 
-            this.btnPrintBill.Location = new System.Drawing.Point(489, 3);
-            this.btnPrintBill.Name = "btnPrintBill";
-            this.btnPrintBill.Size = new System.Drawing.Size(75, 75);
-            this.btnPrintBill.TabIndex = 144;
-            this.btnPrintBill.Text = "Print Bill - F11";
-            this.btnPrintBill.UseVisualStyleBackColor = true;
-            this.btnPrintBill.Click += new System.EventHandler(this.btnPrintBill_Click);
-            // 
-            // btnVoid
-            // 
-            this.btnVoid.Location = new System.Drawing.Point(651, 3);
-            this.btnVoid.Name = "btnVoid";
-            this.btnVoid.Size = new System.Drawing.Size(75, 75);
-            this.btnVoid.TabIndex = 143;
-            this.btnVoid.Text = "Void Bill";
-            this.btnVoid.UseVisualStyleBackColor = true;
-            this.btnVoid.Click += new System.EventHandler(this.btnVoid_Click);
-            // 
-            // btnDiscount
-            // 
-            this.btnDiscount.Location = new System.Drawing.Point(165, 3);
-            this.btnDiscount.Name = "btnDiscount";
-            this.btnDiscount.Size = new System.Drawing.Size(75, 75);
-            this.btnDiscount.TabIndex = 142;
-            this.btnDiscount.Text = "Discount - F3";
-            this.btnDiscount.UseVisualStyleBackColor = true;
-            this.btnDiscount.Click += new System.EventHandler(this.btnDiscount_Click);
-            // 
-            // btnQuantity
-            // 
-            this.btnQuantity.Location = new System.Drawing.Point(3, 3);
-            this.btnQuantity.Name = "btnQuantity";
-            this.btnQuantity.Size = new System.Drawing.Size(75, 75);
-            this.btnQuantity.TabIndex = 141;
-            this.btnQuantity.Text = "Quantity - F2";
-            this.btnQuantity.UseVisualStyleBackColor = true;
-            this.btnQuantity.Click += new System.EventHandler(this.btnQuantity_Click);
-            // 
             // txtTableID
             // 
             this.txtTableID.Location = new System.Drawing.Point(390, 28);
@@ -495,6 +522,31 @@
             this.btnCustomer.UseVisualStyleBackColor = true;
             this.btnCustomer.Click += new System.EventHandler(this.btnCustomer_Click);
             // 
+            // printedDataGridViewTextBoxColumn
+            // 
+            this.printedDataGridViewTextBoxColumn.DataPropertyName = "Printed";
+            dataGridViewCellStyle2.Format = "N2";
+            this.printedDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
+            this.printedDataGridViewTextBoxColumn.HeaderText = "Printed";
+            this.printedDataGridViewTextBoxColumn.Name = "printedDataGridViewTextBoxColumn";
+            this.printedDataGridViewTextBoxColumn.ReadOnly = true;
+            this.printedDataGridViewTextBoxColumn.Width = 5;
+            // 
+            // additionalDataGridViewTextBoxColumn
+            // 
+            this.additionalDataGridViewTextBoxColumn.DataPropertyName = "Additional";
+            dataGridViewCellStyle3.Format = "N2";
+            dataGridViewCellStyle3.NullValue = null;
+            this.additionalDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
+            this.additionalDataGridViewTextBoxColumn.HeaderText = "Additional";
+            this.additionalDataGridViewTextBoxColumn.Name = "additionalDataGridViewTextBoxColumn";
+            this.additionalDataGridViewTextBoxColumn.ReadOnly = true;
+            this.additionalDataGridViewTextBoxColumn.Width = 5;
+            // 
+            // bindingSource
+            // 
+            this.bindingSource.DataSource = typeof(Tanshu.Accounts.Contracts.BillInventory);
+            // 
             // bsWaiter
             // 
             this.bsWaiter.DataSource = typeof(Tanshu.Accounts.Entities.Waiter);
@@ -503,51 +555,15 @@
             // 
             this.bsPending.DataSource = typeof(Tanshu.Accounts.Contracts.PendingBills);
             // 
-            // btnModifier
+            // btnDelete
             // 
-            this.btnModifier.Location = new System.Drawing.Point(246, 3);
-            this.btnModifier.Name = "btnModifier";
-            this.btnModifier.Size = new System.Drawing.Size(75, 75);
-            this.btnModifier.TabIndex = 156;
-            this.btnModifier.Text = "Modifier";
-            this.btnModifier.UseVisualStyleBackColor = true;
-            this.btnModifier.Click += new System.EventHandler(this.btnModifier_Click);
-            // 
-            // flpActions
-            // 
-            this.flpActions.Controls.Add(this.btnQuantity);
-            this.flpActions.Controls.Add(this.btnRate);
-            this.flpActions.Controls.Add(this.btnDiscount);
-            this.flpActions.Controls.Add(this.btnModifier);
-            this.flpActions.Controls.Add(this.btnWaiter);
-            this.flpActions.Controls.Add(this.btnPrintKot);
-            this.flpActions.Controls.Add(this.btnPrintBill);
-            this.flpActions.Controls.Add(this.btnClear);
-            this.flpActions.Controls.Add(this.btnVoid);
-            this.flpActions.Controls.Add(this.btnSettle);
-            this.flpActions.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.flpActions.Location = new System.Drawing.Point(0, 607);
-            this.flpActions.Name = "flpActions";
-            this.flpActions.Size = new System.Drawing.Size(982, 81);
-            this.flpActions.TabIndex = 157;
-            // 
-            // flpGroup
-            // 
-            this.flpGroup.Dock = System.Windows.Forms.DockStyle.Right;
-            this.flpGroup.Location = new System.Drawing.Point(901, 0);
-            this.flpGroup.Name = "flpGroup";
-            this.flpGroup.Size = new System.Drawing.Size(81, 607);
-            this.flpGroup.TabIndex = 158;
-            // 
-            // flpMain
-            // 
-            this.flpMain.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                        | System.Windows.Forms.AnchorStyles.Left)
-                        | System.Windows.Forms.AnchorStyles.Right)));
-            this.flpMain.Location = new System.Drawing.Point(390, 54);
-            this.flpMain.Name = "flpMain";
-            this.flpMain.Size = new System.Drawing.Size(511, 552);
-            this.flpMain.TabIndex = 159;
+            this.btnDelete.Location = new System.Drawing.Point(165, 3);
+            this.btnDelete.Name = "btnDelete";
+            this.btnDelete.Size = new System.Drawing.Size(75, 75);
+            this.btnDelete.TabIndex = 157;
+            this.btnDelete.Text = "Delete";
+            this.btnDelete.UseVisualStyleBackColor = true;
+            this.btnDelete.Click += new System.EventHandler(this.btnDelete_Click);
             // 
             // SalesForm
             // 
@@ -564,12 +580,12 @@
             this.Load += new System.EventHandler(this.SalesForm_Load);
             this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.SalesForm_KeyDown);
             ((System.ComponentModel.ISupportInitialize)(this.dgvProducts)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).EndInit();
             this.pnlBilling.ResumeLayout(false);
             this.pnlBilling.PerformLayout();
+            this.flpActions.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsWaiter)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsPending)).EndInit();
-            this.flpActions.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -610,9 +626,6 @@
         private System.Windows.Forms.Button btnVoid;
         private System.Windows.Forms.Button btnRate;
         private System.Windows.Forms.Button btnClear;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Display;
-        private System.Windows.Forms.DataGridViewTextBoxColumn printedDataGridViewTextBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn additionalDataGridViewTextBoxColumn;
         private System.Windows.Forms.Button btnWaiter;
         internal System.Windows.Forms.Label label1;
         internal System.Windows.Forms.TextBox txtServiceCharge;
@@ -621,6 +634,10 @@
         private System.Windows.Forms.Button btnModifier;
         private System.Windows.Forms.FlowLayoutPanel flpGroup;
         private System.Windows.Forms.FlowLayoutPanel flpMain;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Display;
+        private System.Windows.Forms.DataGridViewTextBoxColumn printedDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn additionalDataGridViewTextBoxColumn;
+        private System.Windows.Forms.Button btnDelete;
     }
 }
 
diff --git a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs
index 8daba03..2c271b3 100644
--- a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs
+++ b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.cs
@@ -19,8 +19,6 @@ namespace Tanshu.Accounts.PointOfSale
         BillController billController;
         List<Button> buttonList = new List<Button>();
         List<Button> buttonHeads = new List<Button>();
-        int page = 0;
-        int pageSize = 6;
 
         public SalesForm(BillController billController)
         {
@@ -167,7 +165,6 @@ namespace Tanshu.Accounts.PointOfSale
             buttonHeads = new List<Button>();
             if (state == SaleFormState.Billing)
             {
-                page = 0;
                 var list = new ProductGroupBI().GetProductGroups();
                 ControlFactory.GenerateGroups(ref flpGroup, ref buttonHeads, new Point(75, 75), 0, list, new ButtonClickDelegate(productTypeButton_Click));
             }
@@ -227,7 +224,7 @@ namespace Tanshu.Accounts.PointOfSale
                 if (start < 0)
                     start = 0;
                 var list = new FoodTableBI().GetFoodTables();
-                ControlFactory.GenerateTables(ref flpGroup, ref buttonHeads, new Point(75, 75), start, list, new ButtonClickDelegate(tableButton_Click));
+                ControlFactory.GenerateTables(ref flpMain, ref buttonHeads, new Point(75, 75), start, list, new ButtonClickDelegate(tableButton_Click));
             }
             else
             {
@@ -281,8 +278,10 @@ namespace Tanshu.Accounts.PointOfSale
         }
         private void btnDiscount_Click(object sender, EventArgs e)
         {
-            if (dgvProducts.Rows.Count > 0)
-                billController.SetDiscount(billController.CurrentProduct, -1);
+            billController.ShowDiscount();
+
+            //if (dgvProducts.Rows.Count > 0)
+            //    billController.SetDiscount(billController.CurrentProduct, -1);
         }
         #endregion
 
@@ -415,9 +414,15 @@ namespace Tanshu.Accounts.PointOfSale
         private void btnModifier_Click(object sender, EventArgs e)
         {
             var item = billController.CurrentProduct;
-            var id = ProductBI.GetProduct(item.ProductID).ProductGroup.ProductGroupID;
+            var id = new ProductGroupBI().GetProductGroupOfProduct(item.ProductID).ProductGroupID;
             billController.ShowModifiers(id, item);
         }
+
+        private void btnDelete_Click(object sender, EventArgs e)
+        {
+            if (dgvProducts.Rows.Count > 0)
+                billController.ProductRemove(billController.CurrentProduct);
+        }
     }
 }
 
diff --git a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.resx b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.resx
index 53e72f3..c41ea0d 100644
--- a/Tanshu.Accounts.PointOfSale/Sales/SalesForm.resx
+++ b/Tanshu.Accounts.PointOfSale/Sales/SalesForm.resx
@@ -123,12 +123,6 @@
   <metadata name="bindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="Display.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="bindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="bsWaiter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>148, 17</value>
   </metadata>
diff --git a/Tanshu.Accounts.PointOfSale/Tanshu.Accounts.PointOfSale.csproj b/Tanshu.Accounts.PointOfSale/Tanshu.Accounts.PointOfSale.csproj
index 6ce39aa..26f0bf7 100644
--- a/Tanshu.Accounts.PointOfSale/Tanshu.Accounts.PointOfSale.csproj
+++ b/Tanshu.Accounts.PointOfSale/Tanshu.Accounts.PointOfSale.csproj
@@ -101,6 +101,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Include\Tanshu.Common.dll</HintPath>
     </Reference>
+    <Reference Include="Tanshu.Common.KeyboardControl, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
     <Reference Include="Tanshu.Data, Version=1.0.0.0, Culture=neutral, PublicKeyToken=fd89fe1d2351f8b5, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Include\Tanshu.Data.dll</HintPath>
@@ -126,12 +127,18 @@
     <Compile Include="Sales\BillSettleForm.Designer.cs">
       <DependentUpon>BillSettleForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Sales\AdjustAdvanceForm.cs">
+    <Compile Include="Advances\AdjustAdvanceForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Sales\AdjustAdvanceForm.designer.cs">
+    <Compile Include="Advances\AdjustAdvanceForm.designer.cs">
       <DependentUpon>AdjustAdvanceForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Sales\DiscountForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Sales\DiscountForm.Designer.cs">
+      <DependentUpon>DiscountForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Sales\ModifierForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -150,10 +157,10 @@
     <Compile Include="User Management\ChangePassword.Designer.cs">
       <DependentUpon>ChangePassword.cs</DependentUpon>
     </Compile>
-    <Compile Include="Sales\CheckoutForm.cs">
+    <Compile Include="Reports\CheckoutForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Sales\CheckoutForm.Designer.cs">
+    <Compile Include="Reports\CheckoutForm.Designer.cs">
       <DependentUpon>CheckoutForm.cs</DependentUpon>
     </Compile>
     <Compile Include="CustomEnums.cs" />
@@ -202,10 +209,13 @@
     <EmbeddedResource Include="Sales\BillSettleForm.resx">
       <DependentUpon>BillSettleForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Sales\AdjustAdvanceForm.resx">
+    <EmbeddedResource Include="Advances\AdjustAdvanceForm.resx">
       <DependentUpon>AdjustAdvanceForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Sales\DiscountForm.resx">
+      <DependentUpon>DiscountForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Sales\ModifierForm.resx">
       <DependentUpon>ModifierForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -217,7 +227,7 @@
       <DependentUpon>ChangePassword.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Sales\CheckoutForm.resx">
+    <EmbeddedResource Include="Reports\CheckoutForm.resx">
       <DependentUpon>CheckoutForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -245,11 +255,11 @@
       <DependentUpon>ProductTypes.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Sales\RecieveAdvanceForm.resx">
+    <EmbeddedResource Include="Advances\RecieveAdvanceForm.resx">
       <DependentUpon>RecieveAdvanceForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Sales\SaleAnalysisForm.resx">
+    <EmbeddedResource Include="Reports\SaleAnalysisForm.resx">
       <DependentUpon>SaleAnalysisForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -258,16 +268,16 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="App.config" />
-    <Compile Include="Sales\RecieveAdvanceForm.cs">
+    <Compile Include="Advances\RecieveAdvanceForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Sales\RecieveAdvanceForm.designer.cs">
+    <Compile Include="Advances\RecieveAdvanceForm.designer.cs">
       <DependentUpon>RecieveAdvanceForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Sales\SaleAnalysisForm.cs">
+    <Compile Include="Reports\SaleAnalysisForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Sales\SaleAnalysisForm.designer.cs">
+    <Compile Include="Reports\SaleAnalysisForm.designer.cs">
       <DependentUpon>SaleAnalysisForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Sales\SalesForm.cs">
@@ -319,10 +329,6 @@
       <Project>{B755D152-37C3-47D6-A721-3AD17A8EF316}</Project>
       <Name>Tanshu.Accounts.Repository</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Tanshu.Common.KeyboardControl\Tanshu.Common.KeyboardControl.csproj">
-      <Project>{4847FEE9-90E1-4795-A644-32867887A653}</Project>
-      <Name>Tanshu.Common.KeyboardControl</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Tanshu.Accounts.Print/Thermal.cs b/Tanshu.Accounts.Print/Thermal.cs
index af05504..031a94b 100644
--- a/Tanshu.Accounts.Print/Thermal.cs
+++ b/Tanshu.Accounts.Print/Thermal.cs
@@ -41,7 +41,9 @@ namespace Tanshu.Accounts.Print
                     Decimal additional = item.Quantity - item.Printed;
                     if (additional != 0)
                     {
-                        BillText += string.Format("\n\r{0,6} x {1,-33}", additional, item.ToString());
+                        BillText += string.Format("\n\r{0,6} x {1,-33}", additional, item.Name);
+                        foreach (var mod in item.Modifiers)
+                            BillText += string.Format("\n\r      --- {0,-32}", mod.Name);
                     }
                 }
                 BillText += DrawLine;
@@ -111,7 +113,7 @@ namespace Tanshu.Accounts.Print
                 BillText += "\n\r" + FormatText(trans.Narration, 42, false, Align.Centre);
                 BillText += DrawLine;
             }
-            if (customer.Name != "Cash")
+            if (customer.CustomerID != 1)
             {
                 BillText += "\n\r" + customer.Name;
                 BillText += string.Format("\n\r{0}\n\r{1}", customer.Phone, customer.Address);
@@ -333,7 +335,7 @@ namespace Tanshu.Accounts.Print
         {
             SaleVoucher trans = new SaleVoucher();
             IList<Inventory> iList = new List<Inventory>();
-            new SaleVoucherBI().GetSaleVoucher(voucherID, out trans, out iList);
+            SaleVoucherBI.GetSaleVoucher(voucherID, out trans, out iList);
             PrintRAW(PrintLocationBI.BasePrinter, DesignBill(trans, list), "Bill");
         }
 
@@ -341,7 +343,7 @@ namespace Tanshu.Accounts.Print
         {
             SaleVoucher trans = new SaleVoucher();
             IList<Inventory> iList = new List<Inventory>();
-            new SaleVoucherBI().GetSaleVoucher(voucherID, out trans, out iList);
+            SaleVoucherBI.GetSaleVoucher(voucherID, out trans, out iList);
             Dictionary<PrintLocation, List<BillInventory>> dict = new Dictionary<PrintLocation, List<BillInventory>>();
             //Dictionary<string, int> dictCount = new Dictionary<string, int>();
             foreach (var item in list)
diff --git a/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductBI.cs b/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductBI.cs
index 1411381..b573687 100644
--- a/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductBI.cs
+++ b/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductBI.cs
@@ -80,7 +80,9 @@ namespace Tanshu.Accounts.Repository
         {
             using (var session = SessionManager.Session)
             {
-                return session.Get<ProductGroup>(productGroupID).Products;
+                return (from product in session.QueryOver<Product>()
+                        where product.ProductGroup.ProductGroupID == productGroupID
+                        select product).List();
             }
         }
     }
diff --git a/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductGroupBI.cs b/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductGroupBI.cs
index 91b50d9..83596dc 100644
--- a/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductGroupBI.cs
+++ b/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductGroupBI.cs
@@ -7,6 +7,7 @@ using Tanshu.Data.DAO;
 using Tanshu.Accounts.Entities;
 using Tanshu.Accounts.SqlDAO;
 using NHibernate.Criterion;
+using NHibernate;
 
 namespace Tanshu.Accounts.Repository
 {
@@ -49,7 +50,17 @@ namespace Tanshu.Accounts.Repository
                 return session.CreateCriteria<ProductGroup>()
                     .List<ProductGroup>();
             }
-
+        }
+        public ProductGroup GetProductGroupOfProduct(int productID)
+        {
+            using (var session = SessionManager.Session)
+            {
+                var item = (from p in session.QueryOver<Product>()
+                        where p.ProductID == productID
+                        select p.ProductGroup).SingleOrDefault<ProductGroup>();
+                NHibernateUtil.Initialize(item);
+                return item;
+            }
         }
     }
 }
diff --git a/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductGroupModifierBI.cs b/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductGroupModifierBI.cs
index 58ee3e4..6d61b88 100644
--- a/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductGroupModifierBI.cs
+++ b/Tanshu.Accounts.SqlDAO/BusinessLayer/ProductGroupModifierBI.cs
@@ -7,6 +7,7 @@ using Tanshu.Data.DAO;
 using Tanshu.Accounts.Entities;
 using Tanshu.Accounts.SqlDAO;
 using NHibernate.Criterion;
+using NHibernate;
 
 namespace Tanshu.Accounts.Repository
 {
@@ -46,9 +47,13 @@ namespace Tanshu.Accounts.Repository
         {
             using (var session = SessionManager.Session)
             {
-                return (from pgm in session.QueryOver<ProductGroupModifier>()
-                        where pgm.ProductGroup == null || pgm.ProductGroup.ProductGroupID == productGroupID
-                        select pgm.Modifier).List<Modifier>();
+                var list = (from pgm in session.QueryOver<ProductGroupModifier>()
+                            where pgm.ProductGroup == null || pgm.ProductGroup.ProductGroupID == productGroupID
+                            select pgm.Modifier).Fetch(x => x.Modifier).Eager.List<Modifier>();
+                //NHibernateUtil.Initialize(list);
+                foreach (var item in list)
+                    NHibernateUtil.Initialize(item);
+                return list;
             }
         }
         public static bool HasCompulsoryModifier(int productGroupID)
diff --git a/Tanshu.Accounts.SqlDAO/BusinessLayer/SaleVoucherBI.cs b/Tanshu.Accounts.SqlDAO/BusinessLayer/SaleVoucherBI.cs
index f667574..d54906f 100644
--- a/Tanshu.Accounts.SqlDAO/BusinessLayer/SaleVoucherBI.cs
+++ b/Tanshu.Accounts.SqlDAO/BusinessLayer/SaleVoucherBI.cs
@@ -7,46 +7,46 @@ using Tanshu.Accounts.Entities;
 using Tanshu.Accounts.SqlDAO;
 using NHibernate.Criterion;
 using Tanshu.Accounts.Entities.Auth;
+using NHibernate;
 
 namespace Tanshu.Accounts.Repository
 {
-    public class SaleVoucherBI
+    public static class SaleVoucherBI
     {
-        public BillInventory GetDefaultSaleBillItem(int productID)
+        static public BillInventory GetDefaultSaleBillItem(int productID)
         {
             Product product;
             using (var session = SessionManager.Session)
             {
                 product = session.Get<Product>(productID);
+                return new BillInventory()
+                {
+                    ProductID = product.ProductID,
+                    Name = product.Units == string.Empty ? product.Name : product.Name + " (" + product.Units + ")",
+                    Price = product.SalePrice,
+                    Tax = product.Tax.Rate,
+                    ServiceCharge = product.ServiceCharge,
+                    Discount = 0,
+                    Printed = 0,
+                    Quantity = 1,
+                };
             }
-            return new BillInventory()
-            {
-                ProductID = product.ProductID,
-                Name = product.Name + " (" + product.Units + ")",
-                Price = product.SalePrice,
-                Tax = product.Tax.Rate,
-                ServiceCharge = product.ServiceCharge,
-                Discount = 0,
-                Printed = 0,
-                Quantity = 1,
-            };
-
         }
-        public decimal GetProductDiscountLimit(int productID)
+        static public decimal GetProductDiscountLimit(int productID)
         {
             using (var session = SessionManager.Session)
             {
                 return session.Get<Product>(productID).ProductGroup.DiscountLimit;
             }
         }
-        public bool IsBillPrinted(int voucherID)
+        static public bool IsBillPrinted(int voucherID)
         {
             using (var session = SessionManager.Session)
             {
                 return session.Get<SaleVoucher>(voucherID).Printed;
             }
         }
-        public bool Insert(SaleVoucher saleVoucher, IList<Inventory> inventory)
+        static public bool Insert(SaleVoucher saleVoucher, IList<Inventory> inventory)
         {
             using (var session = SessionManager.Session)
             {
@@ -65,14 +65,20 @@ namespace Tanshu.Accounts.Repository
                     foreach (var item in inventory)
                     {
                         item.Voucher = saleVoucher;
+                        IList<Modifier> list = new List<Modifier>();
+                        foreach (var mod in item.InventoryModifier)
+                            list.Add(mod.Modifier);
+                        item.InventoryModifier = new List<InventoryModifier>();
                         session.Save(item);
+                        foreach (var mod in list)
+                            session.Save(new InventoryModifier() { Inventory = item, Modifier = mod });
                     }
                     trans.Commit();
                     return true;
                 }
             }
         }
-        public bool Update(SaleVoucher saleVoucher, IList<Inventory> inventory)
+        static public bool Update(SaleVoucher saleVoucher, IList<Inventory> inventory)
         {
             using (var session = SessionManager.Session)
             {
@@ -91,7 +97,14 @@ namespace Tanshu.Accounts.Repository
                     foreach (var item in inventory)
                     {
                         item.Voucher = saleVoucher;
+                        IList<Modifier> list = new List<Modifier>();
+                        foreach (var mod in item.InventoryModifier)
+                            list.Add(mod.Modifier);
+                        item.InventoryModifier = new List<InventoryModifier>();
                         session.Save(item);
+                        foreach (var mod in list)
+                            session.Save(new InventoryModifier() { Inventory = item, Modifier = mod });
+
                     }
                     session.Merge(saleVoucher);
 
@@ -100,12 +113,21 @@ namespace Tanshu.Accounts.Repository
                 }
             }
         }
-        public bool GetSaleVoucher(int voucherID, out SaleVoucher saleVoucher, out IList<Inventory> iList)
+        static public bool GetSaleVoucher(int voucherID, out SaleVoucher saleVoucher, out IList<Inventory> iList)
         {
             using (var session = SessionManager.Session)
             {
                 saleVoucher = session.Get<SaleVoucher>(voucherID);
+                foreach (var item in saleVoucher.Inventories)
+                {
+                    NHibernateUtil.Initialize(item);
+                    foreach (var inmod in item.InventoryModifier)
+                        NHibernateUtil.Initialize(inmod.Modifier);
+                }
                 iList = saleVoucher.Inventories;
+                NHibernateUtil.Initialize(saleVoucher.Customer);
+                NHibernateUtil.Initialize(saleVoucher.Waiter);
+                NHibernateUtil.Initialize(saleVoucher.User);
                 return true;
             }
         }
@@ -122,7 +144,7 @@ namespace Tanshu.Accounts.Repository
         //    }
         //}
 
-        public SaleVoucher GetPendingVoucherID(string tableID)
+        static public SaleVoucher GetPendingVoucherID(string tableID)
         {
             using (var session = SessionManager.Session)
             {
@@ -131,6 +153,21 @@ namespace Tanshu.Accounts.Repository
                         select v).SingleOrDefault();
             }
         }
+        static public string GetTableStatus(string tableID)
+        {
+            using (var session = SessionManager.Session)
+            {
+                var s = (from v in session.QueryOver<SaleVoucher>()
+                         where v.Void == false && v.TableID == tableID && v.Settled.SettleOptionID == SettleOptionFactory.Unsettled
+                         select v).SingleOrDefault();
+                if (s == null)
+                    return "default";
+                else if (s.Printed == true)
+                    return "printed";
+                else
+                    return "running";
+            }
+        }
         //public List<InventoryBO> SaleInventory(Dictionary<BillItemKey, BillInventoryBO>.ValueCollection list, Guid? voucherID)
         //{
         //    GetFactory factory = GetFactory.GetDAOFactory(Database.GetFactoryType);
@@ -164,7 +201,7 @@ namespace Tanshu.Accounts.Repository
         //        }
         //    }
         //}
-        public void VoidBill(int voucherID, string reason)
+        static public void VoidBill(int voucherID, string reason)
         {
             using (var session = SessionManager.Session)
             {
@@ -179,7 +216,7 @@ namespace Tanshu.Accounts.Repository
             }
         }
 
-        public void SettleVoucher(User user, int voucherID, int settleOption)
+        static public void SettleVoucher(User user, int voucherID, int settleOption)
         {
             using (var session = SessionManager.Session)
             {
diff --git a/Tanshu.Accounts.SqlDAO/BusinessLayer/SalesAnalysisBI.cs b/Tanshu.Accounts.SqlDAO/BusinessLayer/SalesAnalysisBI.cs
index 615f437..dc2c29a 100644
--- a/Tanshu.Accounts.SqlDAO/BusinessLayer/SalesAnalysisBI.cs
+++ b/Tanshu.Accounts.SqlDAO/BusinessLayer/SalesAnalysisBI.cs
@@ -38,6 +38,13 @@ ORDER BY Amount DESC;";
         }
         public IList<SalesAnalysis> GetSale(DateTime startDate, DateTime finishDate)
         {
+            using (var session = SessionManager.Session)
+            {
+                var temp = from sal in session.QueryOver<SaleVoucher>()
+                           where sal.Date >= startDate && sal.Date <= finishDate
+                               && sal.Settled != SettleOptionFactory.ONoCharge && sal.Void == false 
+                           select sal.Inventories;
+
             string query = @"
 SELECT c.CostCenterID AS TypeID, c.Name AS Section, SUM(i.Quantity) AS Quantity, SUM(Amount) AS Gross, SUM(i.Quantity * i.Rate * (1 - Discount)) AS Net
 FROM Vouchers t INNER JOIN SaleVoucher s ON t.VoucherID = s.VoucherID
@@ -49,8 +56,6 @@ WHERE t.Type = 's' AND s.Paid = 1 AND s.Void = 0
 AND t.LastEditDate BETWEEN @StartDate AND @FinishDate
 GROUP BY c.CostCenterID, c.Name
 ORDER BY Net DESC;";
-            using (var session = SessionManager.Session)
-            {
                 return session
                    .CreateSQLQuery(query)
                    .AddEntity(typeof(SalesAnalysis))
diff --git a/Tanshu.Accounts.SqlDAO/BusinessLayer/WaiterBI.cs b/Tanshu.Accounts.SqlDAO/BusinessLayer/WaiterBI.cs
index 3aa05ef..ddefacc 100644
--- a/Tanshu.Accounts.SqlDAO/BusinessLayer/WaiterBI.cs
+++ b/Tanshu.Accounts.SqlDAO/BusinessLayer/WaiterBI.cs
@@ -6,6 +6,7 @@ using System.Data.SqlClient;
 using Tanshu.Data.DAO;
 using Tanshu.Accounts.Entities;
 using Tanshu.Accounts.SqlDAO;
+using NHibernate.Criterion;
 
 namespace Tanshu.Accounts.Repository
 {
@@ -49,10 +50,18 @@ namespace Tanshu.Accounts.Repository
                     .List<Waiter>();
             }
         }
+        public static IList<Waiter> GetWaiters(string name)
+        {
+            using (var session = SessionManager.Session)
+            {
+                return session.CreateCriteria<Waiter>()
+                    .Add(Restrictions.InsensitiveLike("Name", string.Format("%{0}%", name)))
+                    .List<Waiter>();
+            }
+        }
         public static IList<Waiter> GetFilteredWaiters(Dictionary<string, string> filter)
         {
-
-            throw new NotImplementedException();
+            return GetWaiters(filter["Name"]);
         }
     }
 }
diff --git a/Tanshu.Accounts.SqlDAO/DbValues.cs b/Tanshu.Accounts.SqlDAO/DbValues.cs
index 845bf24..5da8c99 100644
--- a/Tanshu.Accounts.SqlDAO/DbValues.cs
+++ b/Tanshu.Accounts.SqlDAO/DbValues.cs
@@ -1,9 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
-namespace Tanshu.Accounts.SqlDAO
+namespace Tanshu.Accounts.Repository
 {
     public static class DbValues
     {
diff --git a/Tanshu.Accounts.SqlDAO/Fluent/CascadeConvention.cs b/Tanshu.Accounts.SqlDAO/Fluent/CascadeConvention.cs
new file mode 100644
index 0000000..11f0f8a
--- /dev/null
+++ b/Tanshu.Accounts.SqlDAO/Fluent/CascadeConvention.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using FluentNHibernate.Conventions;
+using FluentNHibernate.Conventions.Instances;
+using Tanshu.Accounts.Contracts;
+using System.Reflection;
+
+namespace Tanshu.Accounts.SqlDAO
+{
+    public class CascadeConvention : IHasManyConvention, IReferenceConvention
+    {
+        public void Apply(IManyToOneInstance instance)
+        {
+            var property = instance.Property;
+
+            if (!HasAttribute(property.MemberInfo)) return;
+
+            Console.WriteLine("CascadeAll on {0}.{1}", property.DeclaringType.Name, property.Name);
+
+            instance.Cascade.All();
+        }
+
+        public void Apply(IOneToManyCollectionInstance instance)
+        {
+            var property = instance.Member;
+
+            if (!HasAttribute(property)) return;
+
+            Console.WriteLine("CascadeAllDeleteOrphan on {0}.{1}", property.DeclaringType.Name, property.Name);
+
+            instance.Cascade.AllDeleteOrphan();
+        }
+
+        bool HasAttribute(ICustomAttributeProvider provider)
+        {
+            return provider.GetCustomAttributes(typeof(CascadeAttribute), false).Length == 1;
+        }
+    }
+}
+
+
diff --git a/Tanshu.Accounts.SqlDAO/Fluent/Fixtures.cs b/Tanshu.Accounts.SqlDAO/Fluent/Fixtures.cs
index 89d1486..fd30972 100644
--- a/Tanshu.Accounts.SqlDAO/Fluent/Fixtures.cs
+++ b/Tanshu.Accounts.SqlDAO/Fluent/Fixtures.cs
@@ -1,19 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using FluentNHibernate.Automapping;
-using Tanshu.Accounts.Contracts;
-using FluentNHibernate.Cfg;
-using FluentNHibernate.Cfg.Db;
-using Tanshu.Accounts.Conventions;
-using Tanshu.Accounts.Entities;
+using System.Globalization;
+using NHibernate.Criterion;
 using NHibernate.Tool.hbm2ddl;
-using NHibernate;
-using NHibernate.Cfg;
+using Tanshu.Accounts.Entities;
 using Tanshu.Accounts.Entities.Auth;
+using Tanshu.Accounts.SqlDAO;
 
-namespace Tanshu.Accounts.SqlDAO
+namespace Tanshu.Accounts.Repository
 {
     public static class Fixtures
     {
@@ -32,12 +24,13 @@ namespace Tanshu.Accounts.SqlDAO
             Fixtures.InsertCustomer();
             Fixtures.InsertTax();
             Fixtures.InsertWaiter();
-            Fixtures.InsertPrintLocation();
             Fixtures.InsertSettleOption();
 
             InsertFoodTable();
             InsertProductGroup();
-            InsertProductBeer();
+            Fixtures.InsertPrintLocationFood();
+            Fixtures.InsertPrintLocationBev();
+            InsertProduct();
             InsertModifier();
             InsertProductGroupModifier();
             return true;
@@ -46,21 +39,21 @@ namespace Tanshu.Accounts.SqlDAO
         #region role
         public static void InsertRole()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                session.Save(GetRole(1, "Sales/Checkout"));
-                session.Save(GetRole(2, "Sales/SalesBill"));
-                session.Save(GetRole(3, "Sales/SaleDetail"));
-                session.Save(GetRole(4, "Sales/VoidPrintedBill"));
-                session.Save(GetRole(5, "Sales/EditBill"));
-                session.Save(GetRole(6, "Sales/PrintKOT"));
-                session.Save(GetRole(7, "Sales/PrintBill"));
-                session.Save(GetRole(8, "Sales/EditPrintedProduct"));
-                session.Save(GetRole(9, "Sales/ChangeRate"));
-                session.Save(GetRole(10, "Master/Products"));
-                session.Save(GetRole(11, "Security/ManageRoles"));
-                session.Save(GetRole(12, "Log/View"));
-                session.Save(GetRole(13, "Master/Owner"));
+                session.Insert(GetRole(1, "Sales/Checkout"));
+                session.Insert(GetRole(2, "Sales/SalesBill"));
+                session.Insert(GetRole(3, "Sales/SaleDetail"));
+                session.Insert(GetRole(4, "Sales/VoidPrintedBill"));
+                session.Insert(GetRole(5, "Sales/EditBill"));
+                session.Insert(GetRole(6, "Sales/PrintKOT"));
+                session.Insert(GetRole(7, "Sales/PrintBill"));
+                session.Insert(GetRole(8, "Sales/EditPrintedProduct"));
+                session.Insert(GetRole(9, "Sales/ChangeRate"));
+                session.Insert(GetRole(10, "Master/Products"));
+                session.Insert(GetRole(11, "Security/ManageRoles"));
+                session.Insert(GetRole(12, "Log/View"));
+                session.Insert(GetRole(13, "Master/Owner"));
             }
         }
         private static Role GetRole(int roleID, string name)
@@ -75,9 +68,9 @@ namespace Tanshu.Accounts.SqlDAO
         #region user
         public static void InsertUser()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                session.Save(GetUser(1, "admin", "password"));
+                session.Insert(GetUser(1, "admin", "password"));
             }
         }
         private static User GetUser(int userID, string name, string password)
@@ -94,14 +87,14 @@ namespace Tanshu.Accounts.SqlDAO
         #region group
         public static void InsertGroup()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                session.Save(GetGroup(1, "owner"));
-                session.Save(GetGroup(2, "waiter"));
-                session.Save(GetGroup(3, "captain"));
-                session.Save(GetGroup(4, "manager"));
-                session.Save(GetGroup(5, "controller"));
-                session.Save(GetGroup(6, "accountant"));
+                session.Insert(GetGroup(1, "owner"));
+                session.Insert(GetGroup(2, "waiter"));
+                session.Insert(GetGroup(3, "captain"));
+                session.Insert(GetGroup(4, "manager"));
+                session.Insert(GetGroup(5, "controller"));
+                session.Insert(GetGroup(6, "accountant"));
             }
         }
         private static Group GetGroup(int groupID, string name)
@@ -116,14 +109,14 @@ namespace Tanshu.Accounts.SqlDAO
         #region user_group
         public static void InsertUserGroup()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
                 var admin = session.Get<User>(1);
                 var list = session.CreateCriteria<Group>()
                     .List<Group>();
                 foreach (var item in list)
                 {
-                    session.Save(new UserGroup()
+                    session.Insert(new UserGroup()
                     {
                         User = admin,
                         Group = item
@@ -135,14 +128,14 @@ namespace Tanshu.Accounts.SqlDAO
         #region role_group
         public static void InsertRoleGroup()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
                 var owner = session.Get<Group>(1);
                 var list = session.CreateCriteria<Role>()
                     .List<Role>();
                 foreach (var item in list)
                 {
-                    session.Save(new RoleGroup()
+                    session.Insert(new RoleGroup()
                     {
                         Role = item,
                         Group = owner
@@ -154,9 +147,9 @@ namespace Tanshu.Accounts.SqlDAO
         #region customer
         public static void InsertCustomer()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                session.Save(new Customer()
+                session.Insert(new Customer()
                 {
                     CustomerID = 1,
                     Code = 1,
@@ -172,23 +165,20 @@ namespace Tanshu.Accounts.SqlDAO
         #region tax
         public static void InsertTax()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                session.Save(new Tax()
+                session.Insert(new Tax()
                 {
-                    TaxID = 1,
                     Name = "VAT + SC 12.5%",
                     Rate = .13125M
                 });
-                session.Save(new Tax()
+                session.Insert(new Tax()
                 {
-                    TaxID = 1,
                     Name = "VAT + SC 25%",
                     Rate = .2625M
                 });
-                session.Save(new Tax()
+                session.Insert(new Tax()
                 {
-                    TaxID = 1,
                     Name = "Service Tax 10.3%",
                     Rate = .103M
                 });
@@ -198,9 +188,9 @@ namespace Tanshu.Accounts.SqlDAO
         #region waiter
         public static void InsertWaiter()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                session.Save(new Waiter()
+                session.Insert(new Waiter()
                 {
                     WaiterID = 1,
                     Name = "Waiter",
@@ -209,33 +199,157 @@ namespace Tanshu.Accounts.SqlDAO
         }
         #endregion
         #region print_location
-        public static void InsertPrintLocation()
+        public static void InsertPrintLocationFood()
         {
             using (var session = SessionManager.Session)
             {
-                session.Save(new PrintLocation()
+                using (var trans = session.BeginTransaction())
                 {
-                    PrintLocationID = 1,
-                    Location = "Ground",
-                    Copies = 2,
-                    Printer = @"\\gandalf\kitchen",
-                    ProductGroup = null,
-                    CutCode = "\n\r\n\r\n\r\n\r\n\r\n\r" + (char)29 + (char)86 + (char)49
-                });
+                    var tax = session.Get<Tax>(1);
+                    var kitList = (from pg in session.QueryOver<ProductGroup>()
+                                   where pg.ProductGroupID == 22 || pg.ProductGroupID == 23 ||
+                                   pg.ProductGroupID == 24 || pg.ProductGroupID == 25 ||
+                                   pg.ProductGroupID == 26 || pg.ProductGroupID == 27 ||
+                                   pg.ProductGroupID == 29 || pg.ProductGroupID == 30 ||
+                                   pg.ProductGroupID == 31 || pg.ProductGroupID == 32 ||
+                                   pg.ProductGroupID == 39
+                                   select pg).List();
+
+                    foreach (var item in kitList)
+                    {
+                        foreach (var pro in item.Products)
+                        {
+                            pro.Tax = tax;
+                        }
+                        session.Save(new PrintLocation()
+                        {
+                            Location = "Basement",
+                            Copies = 2,
+                            Printer = @"\\gandalf\kitchen",
+                            ProductGroup = item,
+                            CutCode = "\n\r\n\r\n\r\n\r\n\r\n\r" + (char)29 + (char)86 + (char)49
+                        });
+
+                        session.Save(new PrintLocation()
+                        {
+                            Location = "Ground",
+                            Copies = 2,
+                            Printer = @"\\gandalf\kitchen",
+                            ProductGroup = item,
+                            CutCode = "\n\r\n\r\n\r\n\r\n\r\n\r" + (char)29 + (char)86 + (char)49
+                        });
+                        session.Save(new PrintLocation()
+                        {
+                            Location = "First",
+                            Copies = 2,
+                            Printer = @"\\gandalf\kitchen",
+                            ProductGroup = item,
+                            CutCode = "\n\r\n\r\n\r\n\r\n\r\n\r" + (char)29 + (char)86 + (char)49
+                        });
+
+                    }
+                    trans.Commit();
+                }
+            }
+        }
+        public static void InsertPrintLocationBev()
+        {
+            using (var session = SessionManager.Session)
+            {
+                using (var trans = session.BeginTransaction())
+                {
+                    var tax = session.Get<Tax>(2);
+                    var kitList = (from pg in session.QueryOver<ProductGroup>()
+                                   where pg.ProductGroupID == 3 || pg.ProductGroupID == 4 ||
+                                   pg.ProductGroupID == 5 || pg.ProductGroupID == 6 ||
+                                   pg.ProductGroupID == 7 || pg.ProductGroupID == 8 ||
+                                   pg.ProductGroupID == 9 || pg.ProductGroupID == 10 ||
+                                   pg.ProductGroupID == 11 || pg.ProductGroupID == 12 ||
+                                   pg.ProductGroupID == 13 || pg.ProductGroupID == 14 ||
+                                   pg.ProductGroupID == 15 || pg.ProductGroupID == 16 ||
+                                   pg.ProductGroupID == 17 || pg.ProductGroupID == 18 ||
+                                   pg.ProductGroupID == 19 || pg.ProductGroupID == 20 ||
+                                   pg.ProductGroupID == 21 || pg.ProductGroupID == 33 ||
+                                   pg.ProductGroupID == 34 || pg.ProductGroupID == 35 ||
+                                   pg.ProductGroupID == 36 || pg.ProductGroupID == 37 ||
+                                   pg.ProductGroupID == 18
+                                   select pg).List();
+
+                    foreach (var item in kitList)
+                    {
+                        foreach (var pro in item.Products)
+                        {
+                            pro.Tax = tax;
+                        }
+
+                        session.Save(new PrintLocation()
+                        {
+                            Location = "Basement",
+                            Copies = 1,
+                            Printer = @"\\jiva4\bill",
+                            ProductGroup = item,
+                            CutCode = "\n\r\n\r\n\r\n\r\n\r\n\r" + (char)29 + (char)86 + (char)49
+                        });
+
+                        session.Save(new PrintLocation()
+                        {
+                            Location = "Ground",
+                            Copies = 1,
+                            Printer = @"\\jiva4\bill",
+                            ProductGroup = item,
+                            CutCode = "\n\r\n\r\n\r\n\r\n\r\n\r" + (char)29 + (char)86 + (char)49
+                        });
+                        session.Save(new PrintLocation()
+                        {
+                            Location = "First",
+                            Copies = 1,
+                            Printer = @"\\jiva1\bills",
+                            ProductGroup = item,
+                            CutCode = "\n\r\n\r\n\r\n\r\n\r\n\r" + (char)29 + (char)86 + (char)49
+                        });
+                    }
+                    session.Save(new PrintLocation()
+                    {
+                        Location = "Basement",
+                        Copies = 1,
+                        Printer = @"\\jiva4\bill",
+                        ProductGroup = null,
+                        CutCode = "\n\r\n\r\n\r\n\r\n\r\n\r" + (char)29 + (char)86 + (char)49
+                    });
+
+                    session.Save(new PrintLocation()
+                    {
+                        Location = "Ground",
+                        Copies = 1,
+                        Printer = @"\\jiva4\bill",
+                        ProductGroup = null,
+                        CutCode = "\n\r\n\r\n\r\n\r\n\r\n\r" + (char)29 + (char)86 + (char)49
+                    });
+                    session.Save(new PrintLocation()
+                    {
+                        Location = "First",
+                        Copies = 1,
+                        Printer = @"\\jiva1\bills",
+                        ProductGroup = null,
+                        CutCode = "\n\r\n\r\n\r\n\r\n\r\n\r" + (char)29 + (char)86 + (char)49
+                    });
+
+                    trans.Commit();
+                }
             }
         }
         #endregion
         #region settle_option
         public static void InsertSettleOption()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                session.Save(SettleOptionFactory.OUnsettled);
-                session.Save(SettleOptionFactory.OCash);
-                session.Save(SettleOptionFactory.OCreditCard);
-                session.Save(SettleOptionFactory.ONoCharge);
-                session.Save(SettleOptionFactory.OBillToCompany);
-                session.Save(SettleOptionFactory.OStaff);
+                session.Insert(SettleOptionFactory.OUnsettled);
+                session.Insert(SettleOptionFactory.OCash);
+                session.Insert(SettleOptionFactory.OCreditCard);
+                session.Insert(SettleOptionFactory.ONoCharge);
+                session.Insert(SettleOptionFactory.OBillToCompany);
+                session.Insert(SettleOptionFactory.OStaff);
             }
         }
         #endregion
@@ -244,69 +358,604 @@ namespace Tanshu.Accounts.SqlDAO
         #region food_table
         public static void InsertFoodTable()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                session.Save(new FoodTable() { FoodTableID = 1, Name = "1" });
-                session.Save(new FoodTable() { FoodTableID = 2, Name = "2" });
-                session.Save(new FoodTable() { FoodTableID = 3, Name = "3" });
-                session.Save(new FoodTable() { FoodTableID = 4, Name = "4" });
-                session.Save(new FoodTable() { FoodTableID = 5, Name = "5" });
-                session.Save(new FoodTable() { FoodTableID = 6, Name = "6" });
-                session.Save(new FoodTable() { FoodTableID = 7, Name = "7" });
-                session.Save(new FoodTable() { FoodTableID = 8, Name = "8" });
-                session.Save(new FoodTable() { FoodTableID = 9, Name = "9" });
-                session.Save(new FoodTable() { FoodTableID = 10, Name = "10" });
+                session.Insert(new FoodTable() { Name = "1" });
+                session.Insert(new FoodTable() { Name = "2" });
+                session.Insert(new FoodTable() { Name = "3" });
+                session.Insert(new FoodTable() { Name = "4" });
+                session.Insert(new FoodTable() { Name = "5" });
+                session.Insert(new FoodTable() { Name = "6" });
+                session.Insert(new FoodTable() { Name = "7" });
+                session.Insert(new FoodTable() { Name = "8" });
+                session.Insert(new FoodTable() { Name = "9" });
+                session.Insert(new FoodTable() { Name = "10" });
+                session.Insert(new FoodTable() { Name = "11" });
+                session.Insert(new FoodTable() { Name = "12" });
+                session.Insert(new FoodTable() { Name = "13" });
+                session.Insert(new FoodTable() { Name = "14" });
+                session.Insert(new FoodTable() { Name = "15" });
+                session.Insert(new FoodTable() { Name = "16" });
+                session.Insert(new FoodTable() { Name = "17" });
+                session.Insert(new FoodTable() { Name = "18" });
+                session.Insert(new FoodTable() { Name = "19" });
+                session.Insert(new FoodTable() { Name = "20" });
+                session.Insert(new FoodTable() { Name = "21" });
+                session.Insert(new FoodTable() { Name = "22" });
+                session.Insert(new FoodTable() { Name = "23" });
+                session.Insert(new FoodTable() { Name = "24" });
+                session.Insert(new FoodTable() { Name = "25" });
+                session.Insert(new FoodTable() { Name = "26" });
+                session.Insert(new FoodTable() { Name = "27" });
+                session.Insert(new FoodTable() { Name = "28" });
+                session.Insert(new FoodTable() { Name = "29" });
+                session.Insert(new FoodTable() { Name = "30" });
+                session.Insert(new FoodTable() { Name = "31" });
+                session.Insert(new FoodTable() { Name = "32" });
+                session.Insert(new FoodTable() { Name = "33" });
+                session.Insert(new FoodTable() { Name = "34" });
+                session.Insert(new FoodTable() { Name = "35" });
+                session.Insert(new FoodTable() { Name = "36" });
+                session.Insert(new FoodTable() { Name = "37" });
+                session.Insert(new FoodTable() { Name = "38" });
+                session.Insert(new FoodTable() { Name = "39" });
+                session.Insert(new FoodTable() { Name = "40" });
+                session.Insert(new FoodTable() { Name = "41" });
+                session.Insert(new FoodTable() { Name = "42" });
+                session.Insert(new FoodTable() { Name = "43" });
+                session.Insert(new FoodTable() { Name = "44" });
+                session.Insert(new FoodTable() { Name = "45" });
+                session.Insert(new FoodTable() { Name = "46" });
+                session.Insert(new FoodTable() { Name = "47" });
+                session.Insert(new FoodTable() { Name = "48" });
+                session.Insert(new FoodTable() { Name = "49" });
+                session.Insert(new FoodTable() { Name = "50" });
+                session.Insert(new FoodTable() { Name = "51" });
+                session.Insert(new FoodTable() { Name = "52" });
+                session.Insert(new FoodTable() { Name = "53" });
+                session.Insert(new FoodTable() { Name = "54" });
+                session.Insert(new FoodTable() { Name = "55" });
+                session.Insert(new FoodTable() { Name = "56" });
+                session.Insert(new FoodTable() { Name = "57" });
+                session.Insert(new FoodTable() { Name = "58" });
+                session.Insert(new FoodTable() { Name = "59" });
+                session.Insert(new FoodTable() { Name = "60" });
             }
         }
         #endregion
-        #region product_group
         public static void InsertProductGroup()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                session.Save(new ProductGroup() { ProductGroupID = 1, Name = "Beer", DiscountLimit = 0, IsModifierCompulsory = false });
-                session.Save(new ProductGroup() { ProductGroupID = 2, Name = "Imported Alcohol", DiscountLimit = 0, IsModifierCompulsory = false });
-                session.Save(new ProductGroup() { ProductGroupID = 3, Name = "IMFL Alcohol", DiscountLimit = 0, IsModifierCompulsory = false });
-                session.Save(new ProductGroup() { ProductGroupID = 4, Name = "Cocktails", DiscountLimit = 0, IsModifierCompulsory = false });
-                session.Save(new ProductGroup() { ProductGroupID = 5, Name = "Indian Starters", DiscountLimit = 0, IsModifierCompulsory = false });
-                session.Save(new ProductGroup() { ProductGroupID = 6, Name = "International Starters", DiscountLimit = 0, IsModifierCompulsory = false });
-                session.Save(new ProductGroup() { ProductGroupID = 7, Name = "Indian Maincourse", DiscountLimit = 0, IsModifierCompulsory = false });
-                session.Save(new ProductGroup() { ProductGroupID = 8, Name = "International Maincourse", DiscountLimit = 0, IsModifierCompulsory = false });
-                session.Save(new ProductGroup() { ProductGroupID = 9, Name = "Pastas", DiscountLimit = 0, IsModifierCompulsory = false });
-                session.Save(new ProductGroup() { ProductGroupID = 10, Name = "Desserts", DiscountLimit = 0, IsModifierCompulsory = false });
+                using (var trans = session.BeginTransaction())
+                {
+                    CultureInfo currentCulture = System.Threading.Thread.CurrentThread.CurrentCulture;
+                    TextInfo currentInfo = currentCulture.TextInfo;
+                    session.Insert(new ProductGroup() { ProductGroupID = 01, Name = currentInfo.ToTitleCase("INDIAN APPETIZERS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 02, Name = currentInfo.ToTitleCase("INDIAN MAIN COURSE".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 03, Name = currentInfo.ToTitleCase("APERITIFS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 04, Name = currentInfo.ToTitleCase("LIQUORS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 05, Name = currentInfo.ToTitleCase("COGNAC".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 06, Name = currentInfo.ToTitleCase("SINGLE MALTS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 07, Name = currentInfo.ToTitleCase("BLENDED SCOTCH".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 08, Name = currentInfo.ToTitleCase("TENNESSE/BOURBON/IRISH".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 09, Name = currentInfo.ToTitleCase("DOMESTIC SCOTCH".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 10, Name = currentInfo.ToTitleCase("VODKA".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 11, Name = currentInfo.ToTitleCase("RUM".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 12, Name = currentInfo.ToTitleCase("GIN".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 13, Name = currentInfo.ToTitleCase("TEQUILA".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 14, Name = currentInfo.ToTitleCase("MOCKTAIL".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 15, Name = currentInfo.ToTitleCase("SOFT BEVERAGE".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 16, Name = currentInfo.ToTitleCase("ICE TEA FLAVOUR".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 66, Name = currentInfo.ToTitleCase("SHOOTERS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 17, Name = currentInfo.ToTitleCase("HOPS N GRAIN BUSTERS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 18, Name = currentInfo.ToTitleCase("TROPICAL COOLER".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 19, Name = currentInfo.ToTitleCase("HOPS N GRAIN CLASSIC".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 20, Name = currentInfo.ToTitleCase("HEADY MIXES".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 21, Name = currentInfo.ToTitleCase("INDIAN SNACKS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 22, Name = currentInfo.ToTitleCase("DASTAR KHWAN".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 23, Name = currentInfo.ToTitleCase("INTERNATIONAL APPETIZER".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 24, Name = currentInfo.ToTitleCase("SALAD".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 25, Name = currentInfo.ToTitleCase("INTERNATIONAL MAINCOURSE".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 26, Name = currentInfo.ToTitleCase("BURGERS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 27, Name = currentInfo.ToTitleCase("PIZZAS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 28, Name = currentInfo.ToTitleCase("DESSERT".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 29, Name = currentInfo.ToTitleCase("INDIAN BREAD".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 30, Name = currentInfo.ToTitleCase("OPEN ITEM".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 67, Name = currentInfo.ToTitleCase("RICE".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 68, Name = currentInfo.ToTitleCase("BEER".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 31, Name = currentInfo.ToTitleCase("WINE".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 69, Name = currentInfo.ToTitleCase("CHAMPAGNE".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 70, Name = currentInfo.ToTitleCase("JUICE".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 71, Name = currentInfo.ToTitleCase("WINE BY GLASS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 72, Name = currentInfo.ToTitleCase("TOBACCO".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Insert(new ProductGroup() { ProductGroupID = 73, Name = currentInfo.ToTitleCase("H N G SPECIAL SNACKS".ToLower()), DiscountLimit = 0, IsModifierCompulsory = false });
+                    session.Delete(new ProductGroup() { ProductGroupID = 1 });
+                    session.Delete(new ProductGroup() { ProductGroupID = 2 });
+                    session.Delete(new ProductGroup() { ProductGroupID = 28 });
+                    trans.Commit();
+                }
             }
         }
-        #endregion
-        #region product_group
-        public static void InsertProductBeer()
+        #region product
+        public static void InsertProduct()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                var tax = session.Get<Tax>(2);
-                var pg = session.Get<ProductGroup>(1);
-                session.Save(new Product() { ProductID = 1, Code = 1, Name = "Wheat Beer", Units = ".5L Mug", SalePrice = 185, ServiceCharge = .1M, Discontinued = false, MaximumLevel = 0, MinimumLevel = 0, ProductGroup = pg, SortOrder = 1, Tax = tax });
-                session.Save(new Product() { ProductID = 2, Code = 2, Name = "Light Beer", Units = ".5L Mug", SalePrice = 160, ServiceCharge = .1M, Discontinued = false, MaximumLevel = 0, MinimumLevel = 0, ProductGroup = pg, SortOrder = 1, Tax = tax });
-                session.Save(new Product() { ProductID = 3, Code = 3, Name = "Dark Beer", Units = ".5L Mug", SalePrice = 160, ServiceCharge = .1M, Discontinued = false, MaximumLevel = 0, MinimumLevel = 0, ProductGroup = pg, SortOrder = 1, Tax = tax });
-                session.Save(new Product() { ProductID = 4, Code = 4, Name = "Premium Beer", Units = ".5L Mug", SalePrice = 185, ServiceCharge = .1M, Discontinued = false, MaximumLevel = 0, MinimumLevel = 0, ProductGroup = pg, SortOrder = 1, Tax = tax });
-                session.Save(new Product() { ProductID = 5, Code = 5, Name = "Wheat Beer", Units = "2L Pcr", SalePrice = 650, ServiceCharge = .1M, Discontinued = false, MaximumLevel = 0, MinimumLevel = 0, ProductGroup = pg, SortOrder = 1, Tax = tax });
-                session.Save(new Product() { ProductID = 6, Code = 6, Name = "Light Beer", Units = "2L Pcr", SalePrice = 550, ServiceCharge = .1M, Discontinued = false, MaximumLevel = 0, MinimumLevel = 0, ProductGroup = pg, SortOrder = 1, Tax = tax });
-                session.Save(new Product() { ProductID = 7, Code = 7, Name = "Dark Beer", Units = "2L Pcr", SalePrice = 550, ServiceCharge = .1M, Discontinued = false, MaximumLevel = 0, MinimumLevel = 0, ProductGroup = pg, SortOrder = 1, Tax = tax });
-                session.Save(new Product() { ProductID = 8, Code = 8, Name = "Premium Beer", Units = "2L Pcr", SalePrice = 650, ServiceCharge = .1M, Discontinued = false, MaximumLevel = 0, MinimumLevel = 0, ProductGroup = pg, SortOrder = 1, Tax = tax });
+                using (var trans = session.BeginTransaction())
+                {
+                    var tax = session.Get<Tax>(2);
+                    var pg01 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "INDIAN APPETIZERS")).UniqueResult<ProductGroup>();
+                    var pg02 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "INDIAN MAIN COURSE")).UniqueResult<ProductGroup>();
+                    var pg03 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "APERITIFS")).UniqueResult<ProductGroup>();
+                    var pg04 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "LIQUORS")).UniqueResult<ProductGroup>();
+                    var pg05 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "COGNAC")).UniqueResult<ProductGroup>();
+                    var pg06 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "SINGLE MALTS")).UniqueResult<ProductGroup>();
+                    var pg07 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "BLENDED SCOTCH")).UniqueResult<ProductGroup>();
+                    var pg08 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "TENNESSE/BOURBON/IRISH")).UniqueResult<ProductGroup>();
+                    var pg09 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "DOMESTIC SCOTCH")).UniqueResult<ProductGroup>();
+                    var pg10 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "VODKA")).UniqueResult<ProductGroup>();
+                    var pg11 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "RUM")).UniqueResult<ProductGroup>();
+                    var pg12 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "GIN")).UniqueResult<ProductGroup>();
+                    var pg13 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "TEQUILA")).UniqueResult<ProductGroup>();
+                    var pg14 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "MOCKTAIL")).UniqueResult<ProductGroup>();
+                    var pg15 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "SOFT BEVERAGE")).UniqueResult<ProductGroup>();
+                    var pg16 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "ICE TEA FLAVOUR")).UniqueResult<ProductGroup>();
+                    var pg66 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "SHOOTERS")).UniqueResult<ProductGroup>();
+                    var pg17 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "HOPS N GRAIN BUSTERS")).UniqueResult<ProductGroup>();
+                    var pg18 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "TROPICAL COOLER")).UniqueResult<ProductGroup>();
+                    var pg19 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "HOPS N GRAIN CLASSIC")).UniqueResult<ProductGroup>();
+                    var pg20 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "HEADY MIXES")).UniqueResult<ProductGroup>();
+                    var pg21 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "INDIAN SNACKS")).UniqueResult<ProductGroup>();
+                    var pg22 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "DASTAR KHWAN")).UniqueResult<ProductGroup>();
+                    var pg23 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "INTERNATIONAL APPETIZER")).UniqueResult<ProductGroup>();
+                    var pg24 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "SALAD")).UniqueResult<ProductGroup>();
+                    var pg25 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "INTERNATIONAL MAINCOURSE")).UniqueResult<ProductGroup>();
+                    var pg26 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "BURGERS")).UniqueResult<ProductGroup>();
+                    var pg27 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "PIZZAS")).UniqueResult<ProductGroup>();
+                    var pg28 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "DESSERT")).UniqueResult<ProductGroup>();
+                    var pg29 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "INDIAN BREAD")).UniqueResult<ProductGroup>();
+                    var pg30 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "OPEN ITEM")).UniqueResult<ProductGroup>();
+                    var pg67 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "RICE")).UniqueResult<ProductGroup>();
+                    var pg68 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "BEER")).UniqueResult<ProductGroup>();
+                    var pg31 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "WINE")).UniqueResult<ProductGroup>();
+                    var pg69 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "CHAMPAGNE")).UniqueResult<ProductGroup>();
+                    var pg70 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "JUICE")).UniqueResult<ProductGroup>();
+                    var pg71 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "WINE BY GLASS")).UniqueResult<ProductGroup>();
+                    var pg72 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "TOBACCO")).UniqueResult<ProductGroup>();
+                    var pg73 = session.CreateCriteria<ProductGroup>().Add(Restrictions.Eq("Name", "H N G SPECIAL SNACKS")).UniqueResult<ProductGroup>();
+
+                    CultureInfo currentCulture = System.Threading.Thread.CurrentThread.CurrentCulture;
+                    TextInfo currentInfo = currentCulture.TextInfo;
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CAMPARI".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg03, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CAMPARI".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg03, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MARTINI DRY".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg03, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MARTINI DRY".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg03, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MARTINI BIANCO".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg03, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MARTINI BIANCO".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg03, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MARTINI ROSSO".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg03, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MARTINI ROSSO".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg03, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BAILEY".ToLower()), Units = "30ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BAILEYS".ToLower()), Units = "60ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLUE CUARACO".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLUE CUARACAO".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("COINTREAU".ToLower()), Units = "30ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("COINTREAU".ToLower()), Units = "60ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DOOLEY'S TOFFEE".ToLower()), Units = "30ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DOOLEY'S TOFFEE".ToLower()), Units = "60ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("KAHLUA".ToLower()), Units = "30ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("KAHLUA".ToLower()), Units = "60ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MALIBU".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MALIBU".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PEACH SCHNAPPS".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PEACH SCHNAPPS".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SAMBUCCA".ToLower()), Units = "30ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SAMBUCCA".ToLower()), Units = "60ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GALLIANO".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GALLIANO".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg04, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MARTEL VSOP".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg05, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MARTEL VSOP".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg05, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("REMI MARTIN VSOP".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg05, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("REMI MARTIN VSOP".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg05, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENMORANGIE 10".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENMORANGIE 10".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DALMORE 12".ToLower()), Units = "30ml", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DALMORE 12".ToLower()), Units = "60ml", SalePrice = 700.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CARDHU".ToLower()), Units = "30ml", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CARDHU".ToLower()), Units = "60ml", SalePrice = 700.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENFIDDICH 12".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENFIDDICH 12".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENFIDDICH 15".ToLower()), Units = "30ml", SalePrice = 450.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENFIDDICH 15".ToLower()), Units = "60ml", SalePrice = 900.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENFIDDICH 18".ToLower()), Units = "30ml", SalePrice = 550.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENFIDDICH 18".ToLower()), Units = "60ml", SalePrice = 1100.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENLIVET 12".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENVIT 12".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENLIVIT 15".ToLower()), Units = "30ml", SalePrice = 450.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENLIVET 15".ToLower()), Units = "60ml", SalePrice = 900.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENLIVET 18".ToLower()), Units = "30ml", SalePrice = 550.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GLENLIVET 18".ToLower()), Units = "60ml", SalePrice = 1100.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BALVENIE 12".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BALVENIE 12".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BALVENIE 15".ToLower()), Units = "30ml", SalePrice = 450.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BALVENIE 15".ToLower()), Units = "60ml", SalePrice = 900.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BALVENIE 21".ToLower()), Units = "30ml", SalePrice = 1200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BALVENIE 21".ToLower()), Units = "60ml", SalePrice = 2400.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JURA".ToLower()), Units = "30ml", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JURA".ToLower()), Units = "60ml", SalePrice = 700.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("LAPHORAIG".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("LAPHORAIG".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("J W BLUE LABEL".ToLower()), Units = "30ml", SalePrice = 800.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("J W BLUE LABEL".ToLower()), Units = "60ml", SalePrice = 1600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CHIVAS 18".ToLower()), Units = "30ml", SalePrice = 550.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CHIVAS 18".ToLower()), Units = "60ml", SalePrice = 1100.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("J W GOLD LABEL".ToLower()), Units = "30ml", SalePrice = 550.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("J W GOLD LABEL".ToLower()), Units = "60ml", SalePrice = 1100.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CHIVAS 12".ToLower()), Units = "30ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CHIVAS 12".ToLower()), Units = "60ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DEWARS 12".ToLower()), Units = "30ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DEWARS 12".ToLower()), Units = "60ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("J W BLACK LABEL".ToLower()), Units = "30ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("J W BLACK LABEL".ToLower()), Units = "60ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BALLENTINE".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BALLENTINE".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("J W RED LABEL".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("J W RED LABEL".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg07, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JACK DANIEL".ToLower()), Units = "30ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg08, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JACK DANIEL".ToLower()), Units = "60ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg08, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JIM BEAM".ToLower()), Units = "30ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg08, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JIM BEAM".ToLower()), Units = "60ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg08, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JAMESON".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg08, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JAMESON".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg08, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TEACHER 50".ToLower()), Units = "30ml", SalePrice = 200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TEACHER 50".ToLower()), Units = "60ml", SalePrice = 400.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("OPEN BEVERAGE".ToLower()), Units = "", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg30, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLACK DOG 12".ToLower()), Units = "30ml", SalePrice = 200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("OPEN FOOD".ToLower()), Units = "", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg30, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLACK DOG 12".ToLower()), Units = "60ml", SalePrice = 400.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("OPEN LIQUOR".ToLower()), Units = "", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg30, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("VAT 69".ToLower()), Units = "30ml", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("VAT 69".ToLower()), Units = "60ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MURGH TIKKA ANGARA".ToLower()), Units = "", SalePrice = 285.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("H N G SPL SEEKH KEBAB".ToLower()), Units = "", SalePrice = 315.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TANDOORI GHOST SEEKH".ToLower()), Units = "", SalePrice = 315.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MUTTON BOTI KEBAB".ToLower()), Units = "", SalePrice = 315.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TANDOORI MEAT PLATTER".ToLower()), Units = "", SalePrice = 405.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("AMRITSARI NIMBUWALI  MACHLI".ToLower()), Units = "", SalePrice = 315.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CHICKEN MALAI TIKKA".ToLower()), Units = "", SalePrice = 285.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("FISH TKKA".ToLower()), Units = "", SalePrice = 315.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("HARI MIRCH KA PANEER".ToLower()), Units = "", SalePrice = 215.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PALAK MATTAR KE KEBAB".ToLower()), Units = "", SalePrice = 215.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("100 PIPERS".ToLower()), Units = "30ml", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SEASAME RESHMI  KEBAB".ToLower()), Units = "", SalePrice = 235.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ALOO ANJEER KE SHOLAY".ToLower()), Units = "", SalePrice = 245.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TANDOORI KHUMB".ToLower()), Units = "", SalePrice = 225.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DUM ALOO".ToLower()), Units = "", SalePrice = 185.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("KARAHI PANEER".ToLower()), Units = "", SalePrice = 215.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PANEER TIKKA BUTTER MASALA".ToLower()), Units = "", SalePrice = 215.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SHAHI PANEER".ToLower()), Units = "", SalePrice = 245.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("VEGETABLE KOFTA CURRY".ToLower()), Units = "", SalePrice = 245.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SAAG PANEER KHUMBI".ToLower()), Units = "", SalePrice = 215.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MIX VEGETABLE".ToLower()), Units = "", SalePrice = 225.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("100 PIPERS".ToLower()), Units = "60ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PUNJABI CHANNA MASALA".ToLower()), Units = "", SalePrice = 185.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("VEGETABLE KOVLUM".ToLower()), Units = "", SalePrice = 245.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CHICKEN KARHAI".ToLower()), Units = "", SalePrice = 265.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("KASHMIRI ROGANJOSH".ToLower()), Units = "", SalePrice = 325.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BUTTER CHICKEN MASALA".ToLower()), Units = "", SalePrice = 265.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TANDOORI PRAWN MASALA".ToLower()), Units = "", SalePrice = 440.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CHICKEN KOVLAM".ToLower()), Units = "", SalePrice = 315.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BRUSCHETTA NON VEG".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("NAKED WINGS".ToLower()), Units = "", SalePrice = 280.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("LAMB KIBBEH".ToLower()), Units = "", SalePrice = 325.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TEACHER HIGHLAND".ToLower()), Units = "30ml", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("FISH FINGERS".ToLower()), Units = "", SalePrice = 345.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SPICY CHICKEN STRIPS".ToLower()), Units = "", SalePrice = 280.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GOLDEN FRIED PRAWNS".ToLower()), Units = "", SalePrice = 385.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MOZZARELLA HOPPERS".ToLower()), Units = "", SalePrice = 225.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SHITAKE POLENTA".ToLower()), Units = "", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("COTTAGE CHEESE FINGERS".ToLower()), Units = "", SalePrice = 225.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TEMPURA VEGETABLES".ToLower()), Units = "", SalePrice = 235.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("WARM CHICKEN SALAD".ToLower()), Units = "", SalePrice = 185.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg24, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GRILLED VEGETABLE SALAD".ToLower()), Units = "", SalePrice = 175.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg24, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CESAR SALAD VEG".ToLower()), Units = "", SalePrice = 175.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg24, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TEACHER HIGHLAND".ToLower()), Units = "60ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CHICKEN BURGERS".ToLower()), Units = "", SalePrice = 215.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg26, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("LAMB BURGER".ToLower()), Units = "", SalePrice = 255.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg26, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("VEGETABLE BURGERS".ToLower()), Units = "", SalePrice = 195.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg26, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CEASER SALAD CHICKEN".ToLower()), Units = "", SalePrice = 200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg24, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CEASER SALAD PRAWN".ToLower()), Units = "", SalePrice = 225.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg24, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PAVILION SALAD".ToLower()), Units = "", SalePrice = 175.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg24, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MEZZE PLATTER VEG".ToLower()), Units = "", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BBQ SPARE RIBS".ToLower()), Units = "", SalePrice = 340.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MEZZE PLATTER NON-VEG".ToLower()), Units = "", SalePrice = 425.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DAL MAKHANI".ToLower()), Units = "", SalePrice = 205.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ROBATO CAVALI".ToLower()), Units = "30ml", SalePrice = 800.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DAL TADKA".ToLower()), Units = "", SalePrice = 165.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("FISH TIKKA CURRY".ToLower()), Units = "", SalePrice = 415.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("RARA GHOST".ToLower()), Units = "", SalePrice = 325.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg22, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("VEGETABLE BIRYANI".ToLower()), Units = "", SalePrice = 285.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg67, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CHICKEN BIRYANI".ToLower()), Units = "", SalePrice = 325.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg67, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MUTTON BIRYANI".ToLower()), Units = "", SalePrice = 365.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg67, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JEERA RICE".ToLower()), Units = "", SalePrice = 135.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg67, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("STEAMED RICE".ToLower()), Units = "", SalePrice = 120.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg67, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TANDOORI ROTI".ToLower()), Units = "", SalePrice = 30.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg29, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BUTTER ROTI".ToLower()), Units = "", SalePrice = 35.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg29, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ROBATO CAVALI".ToLower()), Units = "60ml", SalePrice = 1600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TANDOORI NAAN".ToLower()), Units = "", SalePrice = 35.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg29, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("LACHHEDAR BT NAAN".ToLower()), Units = "", SalePrice = 40.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg29, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GARLIC/CORRIANDER NAAN".ToLower()), Units = "", SalePrice = 45.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg29, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("OLIVE NAAN".ToLower()), Units = "", SalePrice = 60.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg29, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("LACHHA/PUDDINA PRNTHA".ToLower()), Units = "", SalePrice = 50.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg29, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ROMALI ROTI".ToLower()), Units = "", SalePrice = 55.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg29, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GULAB JAMUN".ToLower()), Units = "", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg28, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TIRAMISU".ToLower()), Units = "", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg28, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SIZZLING BROWNIE".ToLower()), Units = "", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg28, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MURGH TANDOORI HALF".ToLower()), Units = "", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CIROC".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MURGH TANDOORI FULL".ToLower()), Units = "", SalePrice = 365.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("LASAGNE".ToLower()), Units = "", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("RISOTTO AL BAROLO".ToLower()), Units = "", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("RISOTTO GAMBERETTI".ToLower()), Units = "", SalePrice = 415.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("RISOTTO CON IL POLLO".ToLower()), Units = "", SalePrice = 385.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GRILLED KING FISH".ToLower()), Units = "", SalePrice = 415.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PEPPERONI CHICKEN".ToLower()), Units = "", SalePrice = 325.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CHICKEN IN RED WINE SAUCE".ToLower()), Units = "", SalePrice = 325.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GRILLED PORK CHOPS".ToLower()), Units = "", SalePrice = 415.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PASTA VEGGIES".ToLower()), Units = "", SalePrice = 225.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CIROC".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GRAYGOOSE".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("IRISH CAR BOMB".ToLower()), Units = "", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg17, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BOILER MAKER".ToLower()), Units = "", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg17, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GRAYGOOSE".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ABSOULT".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ABSOULTE".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ABSOULTE KURANT".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ABSOULTE KURANT".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ABSOULT MANDRIN".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ABSOULTE MANDRIN".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ABSOLUTE CITRON".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ABSOLUTE CITRON".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ABSOLUTE BLACK PEPPER".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ABSOLUTE BLACK PEPPER".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SMIRNOFF".ToLower()), Units = "30ml", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SMIRNOFF".ToLower()), Units = "60ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SMIRNOFF CITRUS".ToLower()), Units = "30ml", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SMIRNOFF CITRUS".ToLower()), Units = "60ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BACARDI BLACK".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BACARDI BLACK".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BACARDI ORO".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BACARDI ORO".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("HAVANA CLUB".ToLower()), Units = "30ml", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("HAVANA CLUB".ToLower()), Units = "60ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CAPTAIN MORGAN".ToLower()), Units = "30ml", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CAPTAIN MORGAN".ToLower()), Units = "60ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BACARDI CARTA BLANCA".ToLower()), Units = "30ml", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("OLD MONK".ToLower()), Units = "30ml", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("OLD MONK".ToLower()), Units = "60ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BEEFEATER".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BEEFEATER".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BOMBAY SAPHIRE".ToLower()), Units = "30ml", SalePrice = 200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BOMBAY SAPHIRE".ToLower()), Units = "60ml", SalePrice = 400.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TANQUERRY".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TANQUERRY".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GORDON".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GORDON".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CORALLEJO ANEJO".ToLower()), Units = "30ml", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CORALLEJO ANEJO".ToLower()), Units = "60ml", SalePrice = 1000.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CORALLEJO TRIPLE DSTLD".ToLower()), Units = "30ml", SalePrice = 450.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CORALLEJO TRIPLE DSTLD".ToLower()), Units = "60ml", SalePrice = 900.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CORALLEJO REPOSADO".ToLower()), Units = "30ml", SalePrice = 400.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CORALLEJO REPOSADO".ToLower()), Units = "60ml", SalePrice = 800.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CORALLEJO BLANCO".ToLower()), Units = "30ml", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CORALLEJO BLANCO".ToLower()), Units = "60ml", SalePrice = 700.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SAUZA SILVER".ToLower()), Units = "30ml", SalePrice = 200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SAUZA SILVER".ToLower()), Units = "60ml", SalePrice = 400.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SAUZA GOLD".ToLower()), Units = "30ml", SalePrice = 200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SAUZA GOLD".ToLower()), Units = "60ml", SalePrice = 400.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg13, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("LYCHEE MINT".ToLower()), Units = "", SalePrice = 90.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg14, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SAFE SEX ON THE BEACH".ToLower()), Units = "", SalePrice = 90.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg14, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("APPLE SOAKED MOJITO".ToLower()), Units = "", SalePrice = 90.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg14, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SPICY GUAVA MARY".ToLower()), Units = "", SalePrice = 90.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg14, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ICED GREEN TEA".ToLower()), Units = "", SalePrice = 100.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg14, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ICED MINT TEA".ToLower()), Units = "", SalePrice = 100.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg14, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("RED BULL ENERGY DRINK".ToLower()), Units = "", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg15, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("EVIAN NATURAL MINERAL WATER".ToLower()), Units = "", SalePrice = 200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg15, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PERRIER NATURL SPARKLING WATER".ToLower()), Units = "", SalePrice = 200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg15, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DIET PEPSI".ToLower()), Units = "", SalePrice = 55.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg15, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TONIC WATER".ToLower()), Units = "", SalePrice = 55.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg15, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("AERATED WATER".ToLower()), Units = "", SalePrice = 55.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg15, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("QUA NATURAL MINERAL WATER".ToLower()), Units = "", SalePrice = 75.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg15, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("AQUAFINA MINERAL WATER".ToLower()), Units = "", SalePrice = 55.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg15, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("FRESH LIME SODA".ToLower()), Units = "", SalePrice = 55.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg15, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("FRESH LIME WATER".ToLower()), Units = "", SalePrice = 55.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg15, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("APPLE TEA".ToLower()), Units = "", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg16, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ROSEMARY TEA".ToLower()), Units = "", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg16, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CINNAMON TEA".ToLower()), Units = "", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg16, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GINGER TEA".ToLower()), Units = "", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg16, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MINT TEA".ToLower()), Units = "", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg16, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("VODKA GINGER SHANDY".ToLower()), Units = "", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg17, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("RED EYE".ToLower()), Units = "", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg17, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLUE BREEZE".ToLower()), Units = "", SalePrice = 500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg17, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MAI TAI".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SEX ON THE BEACH".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JAMAICAN BREEZE".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MALI BOOZE".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLUE HAWAIIAN".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MARGARITA".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("STRAWBERRY MARGRITA".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DAIQUIRI".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("COSMOPOLITAN".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GREEN APPLE MARTINI".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MOJITO".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("WATERMELON MOJITO".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CAIPIROJKA".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("KAFIR LIME CAIPIROJKA".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CUMBER, GINGER BEEFEATER".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MINT JULEP".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MELON SNGRIA PITCHR".ToLower()), Units = "", SalePrice = 1200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MELON SANGRIAS  GLASS".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SANGRIAS ROSSO GLASS".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SANGRIAS BLUSH GLASS".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("L I I T".ToLower()), Units = "", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg20, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("L BEACH I T".ToLower()), Units = "", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg20, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SEVEN STEP OF HELL".ToLower()), Units = "", SalePrice = 1200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg66, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("FLAMING  LAMORGHINI".ToLower()), Units = "", SalePrice = 1200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg66, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("B-52".ToLower()), Units = "", SalePrice = 400.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg66, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BRAIN HAEMORRHAGE".ToLower()), Units = "", SalePrice = 400.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg66, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JELLY FISH".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg66, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLOODY MARIA".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg66, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GASOLINE".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg66, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SANGRIA ROSSO  PITCHER".ToLower()), Units = "", SalePrice = 1200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SANGRIA BLUSH PITCHER".ToLower()), Units = "", SalePrice = 1200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BELEVEDERE".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BELEVEDERE".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLOODY MERRY".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PINA COLADA".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TEQUILA SUNRISE".ToLower()), Units = "", SalePrice = 325.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SCREW DRIVER".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PLANTERS PUNCH".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLUE LAGOON".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MANHATTAN".ToLower()), Units = "", SalePrice = 325.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("WHISKEY SOUR".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CLASSIC MARTINI".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SPICY MARTINI".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("APPLETINI".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("WHITE RUSSIAN".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg18, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("KAMIKAZE FLAVOUR".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg66, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BEER LAGER".ToLower()), Units = "", SalePrice = 160.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg68, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PASTA CHICKEN".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BEER PREMIUM".ToLower()), Units = "", SalePrice = 185.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg68, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BEER WEISS".ToLower()), Units = "", SalePrice = 185.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg68, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BEER DARK".ToLower()), Units = "", SalePrice = 160.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg68, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BEER LAGER PITCHER".ToLower()), Units = "", SalePrice = 550.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg68, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BEER PREMIUM PITCHER".ToLower()), Units = "", SalePrice = 650.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg68, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BEER PITCHER WEISS".ToLower()), Units = "", SalePrice = 650.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg68, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BEER DARK PITCHER".ToLower()), Units = "", SalePrice = 550.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg68, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DOM PERIGNON BRUT".ToLower()), Units = "", SalePrice = 16000.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg69, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MOET & CHANDON BRUT IMPERIAL".ToLower()), Units = "", SalePrice = 8000.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg69, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MOET & CHANDON N V ROSE".ToLower()), Units = "", SalePrice = 9000.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg69, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PASTA MUTTON".ToLower()), Units = "", SalePrice = 285.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CORDON NEGRO BURT 07".ToLower()), Units = "", SalePrice = 2000.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg69, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PROSECCO SPUMANTE BRUT TI AMO".ToLower()), Units = "", SalePrice = 2500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg69, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("AFRICAN HORIZON PINOTAGE".ToLower()), Units = "", SalePrice = 1500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("AFRICAN HORIZON SHIRAZ".ToLower()), Units = "", SalePrice = 1500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ASTICA CABERNET SAUVIGNON".ToLower()), Units = "", SalePrice = 1500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("HARDY'S SHIRAZ CABERNET".ToLower()), Units = "", SalePrice = 1650.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JACOB'S CREEK SHIRAJ CABERNET".ToLower()), Units = "", SalePrice = 1700.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MALAMBO SHIRAZ MALBEC".ToLower()), Units = "", SalePrice = 1500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("RUFFINO CHIANTI ROSSO".ToLower()), Units = "", SalePrice = 2500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("WOODBRIDGE CABERNET SAUVIGNON".ToLower()), Units = "", SalePrice = 1750.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PASTA PRAWNS".ToLower()), Units = "", SalePrice = 295.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("WOODBRIDGE MERLOT".ToLower()), Units = "", SalePrice = 1750.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TRAPICHE MALBEC".ToLower()), Units = "", SalePrice = 1750.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("AFRICAN HORIZON SAUVIGNON".ToLower()), Units = "", SalePrice = 1500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ASTICA TORRENTES".ToLower()), Units = "", SalePrice = 1500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("HARDY'S CHARDONNAY SEMILLION".ToLower()), Units = "", SalePrice = 1650.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JACOB'S CREEK CHARDONNAY".ToLower()), Units = "", SalePrice = 1700.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MALAMBO CHENIN CHARDONNAY".ToLower()), Units = "", SalePrice = 1500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("RUFINO ORIVETO CLASSICO".ToLower()), Units = "", SalePrice = 1700.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("WOODBRIDGE CHARDONNAY".ToLower()), Units = "", SalePrice = 1650.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("WOODBRIDGE SAUVIGNON BLANC".ToLower()), Units = "", SalePrice = 1650.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PASTA RIVER SOLE FISH".ToLower()), Units = "", SalePrice = 315.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TRAPICHE SAUVIGNON".ToLower()), Units = "", SalePrice = 1650.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("WOODBRIDGE WHITE ZIN".ToLower()), Units = "", SalePrice = 1650.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BELOW 42".ToLower()), Units = "30ml", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BELOW 42".ToLower()), Units = "60ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ISLE OF JURA".ToLower()), Units = "30ml", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ISLE OF JURA".ToLower()), Units = "60ml", SalePrice = 600.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg06, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("JUICE".ToLower()), Units = "", SalePrice = 55.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg70, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BRUSCHETTA VEG".ToLower()), Units = "", SalePrice = 200.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg23, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("INDIA KINGS".ToLower()), Units = "", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg72, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CLASSIC MILD".ToLower()), Units = "", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg72, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PASTA BACON".ToLower()), Units = "", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CLASSIC REGULAR".ToLower()), Units = "", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg72, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("B N H LIGHT".ToLower()), Units = "", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg72, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("HARDYS CHARDONNAY WHITE GL".ToLower()), Units = "", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg71, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MALAMBO CHENIN WHITE GL".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("AFRICAN HORIZON WHITE GL".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("HARDYS SHIRAZ CAB RED GL".ToLower()), Units = "", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MALAMBO SHIREZ MEL RED GL".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("AFRICAN HORIZON SHI RED GL".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg31, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DRY MARTINI".ToLower()), Units = "", SalePrice = 300.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg19, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BACARDI CARTA BLANCA".ToLower()), Units = "60ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("PASTA MIX SAUSAGE".ToLower()), Units = "", SalePrice = 350.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg25, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TANDOORI VEG PLATTER".ToLower()), Units = "", SalePrice = 325.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg21, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MASALA FISH FINGER".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg73, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("MIXED CHICKEN SAUSAGE PLATTER".ToLower()), Units = "", SalePrice = 225.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg73, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("SHAMMI KEBAB".ToLower()), Units = "", SalePrice = 225.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg73, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("LEHSUNI CHICKEN TIKKA".ToLower()), Units = "", SalePrice = 275.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg73, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DEVIL FRIED CHICKEN".ToLower()), Units = "", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg73, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("GRILLED VEGETABLES".ToLower()), Units = "", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg73, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("ALOO MINT TINKA".ToLower()), Units = "", SalePrice = 150.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg73, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLUE RIBAND".ToLower()), Units = "60ml", SalePrice = 250.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("H. H BEER MUG".ToLower()), Units = "", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg68, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("DOM PERIGNON".ToLower()), Units = "", SalePrice = 16000.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg69, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("TIAMO PROSECCO BRUT".ToLower()), Units = "", SalePrice = 2000.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg69, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("CORDON NEGRO BRUT".ToLower()), Units = "", SalePrice = 2500.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg69, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("BLUE RIBAND".ToLower()), Units = "30ml", SalePrice = 125.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("H H WHISKEY".ToLower()), Units = "30ml", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("H H WHISKY".ToLower()), Units = "60ml", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg09, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("H H VODKA".ToLower()), Units = "30ml", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("H H VODKA".ToLower()), Units = "60ml", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg10, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("H H GIN".ToLower()), Units = "30ml", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("H H GIN".ToLower()), Units = "60ml", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg12, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("H H RUM".ToLower()), Units = "30ml", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    session.Insert(new Product() { Name = currentInfo.ToTitleCase("H H RUM".ToLower()), Units = "60ml", SalePrice = 0.00000000M, ServiceCharge = .1M, Discontinued = false, ProductGroup = pg11, SortOrder = 1, Tax = tax });
+                    trans.Commit();
+                }
             }
         }
         #endregion
         #region modifiers
         public static void InsertModifier()
         {
-            using (var session = SessionManager.Session)
+            using (var session = SessionManager.StatelessSession)
             {
-                session.Save(new Modifier() { ModifierID = 1, Name = "On the Rocks" });
-                session.Save(new Modifier() { ModifierID = 2, Name = "Frozen" });
-                session.Save(new Modifier() { ModifierID = 3, Name = "Soda" });
-                session.Save(new Modifier() { ModifierID = 4, Name = "Water" });
+                session.Insert(new Modifier() { Name = "On the Rocks" });
+                session.Insert(new Modifier() { Name = "Frozen" });
+                session.Insert(new Modifier() { Name = "Soda" });
+                session.Insert(new Modifier() { Name = "Water" });
+                session.Insert(new Modifier() { Name = "Less Sweet" });
+                session.Insert(new Modifier() { Name = "Mix" });
+                session.Insert(new Modifier() { Name = "Sugar Separate" });
+                session.Insert(new Modifier() { Name = "Straight" });
+                session.Insert(new Modifier() { Name = "Crushed Ice" });
+
+                session.Insert(new Modifier() { Name = "Orange Juice" });
+                session.Insert(new Modifier() { Name = "Pineapple Juice" });
+                session.Insert(new Modifier() { Name = "Mango Juice" });
+                session.Insert(new Modifier() { Name = "Mix Fruit Juice" });
+                session.Insert(new Modifier() { Name = "Cranberry Juice" });
+                session.Insert(new Modifier() { Name = "Litchi Juice" });
+                session.Insert(new Modifier() { Name = "Apple Juice" });
+
+
+                session.Insert(new Modifier() { Name = "Spicy" });
+                session.Insert(new Modifier() { Name = "Mild" });
+                session.Insert(new Modifier() { Name = "No Onion" });
+                session.Insert(new Modifier() { Name = "No Garlic" });
+                session.Insert(new Modifier() { Name = "Less Oil" });
+                session.Insert(new Modifier() { Name = "HOLD" });
+
+
+
+                session.Insert(new Modifier() { Name = "Arrabiata" });
+                session.Insert(new Modifier() { Name = "Carbonara" });
+                session.Insert(new Modifier() { Name = "Cheese Sauce" });
+                session.Insert(new Modifier() { Name = "Pesto" });
+                session.Insert(new Modifier() { Name = "Aglie e Olio" });
+                session.Insert(new Modifier() { Name = "Marinara" });
+                session.Insert(new Modifier() { Name = "Bolognaise" });
+
+                session.Insert(new Modifier() { Name = "Penne" });
+                session.Insert(new Modifier() { Name = "Speghetti" });
+                session.Insert(new Modifier() { Name = "Fettuccine" });
+                session.Insert(new Modifier() { Name = "Farfalle" });
+
+
+
 
-                session.Save(new Modifier() { ModifierID = 5, Name = "Spicy" });
-                session.Save(new Modifier() { ModifierID = 6, Name = "HOLD" });
             }
         }
         #endregion
@@ -317,10 +966,80 @@ namespace Tanshu.Accounts.SqlDAO
             {
                 using (var trans = session.BeginTransaction())
                 {
-                    foreach (var item in session.CreateCriteria<Modifier>().List<Modifier>())
+                    #region hold
+                    var modhold = session.Get<Modifier>(22);
+                    session.Save(new ProductGroupModifier() { Modifier = modhold });
+                    #endregion
+                    var pgs = (from pg in session.QueryOver<ProductGroup>()
+                               where pg.ProductGroupID == 26
+                               select pg).SingleOrDefault<ProductGroup>();
+                    #region pasta
+                    var pastamod = (from pg in session.QueryOver<Modifier>()
+                                    where pg.ModifierID == 23 || pg.ModifierID == 24 || pg.ModifierID == 25 || pg.ModifierID == 26 || pg.ModifierID == 27 || pg.ModifierID == 28 || pg.ModifierID == 29 || pg.ModifierID == 30 || pg.ModifierID == 31 || pg.ModifierID == 32 || pg.ModifierID == 33
+                                    select pg).List<Modifier>();
+                    foreach (var item in pastamod)
                     {
-                        session.Save(new ProductGroupModifier() { Modifier = item });
+                        session.Save(new ProductGroupModifier()
+                        {
+                            ShowAutomatically = true,
+                            ProductGroup = pgs,
+                            Modifier = item
+                        });
                     }
+                    #endregion
+                    #region kitchen
+                    var kitmod = (from pg in session.QueryOver<Modifier>()
+                                  where pg.ModifierID == 17 || pg.ModifierID == 18 || pg.ModifierID == 19 || pg.ModifierID == 20 || pg.ModifierID == 21
+                                  select pg).List<Modifier>();
+
+                    var kitList = (from pg in session.QueryOver<ProductGroup>()
+                                   where pg.ProductGroupID == 22 || pg.ProductGroupID == 23 ||
+                                   pg.ProductGroupID == 24 || pg.ProductGroupID == 25 ||
+                                   pg.ProductGroupID == 26 || pg.ProductGroupID == 27 ||
+                                   pg.ProductGroupID == 29 || pg.ProductGroupID == 30 ||
+                                   pg.ProductGroupID == 31 || pg.ProductGroupID == 32 ||
+                                   pg.ProductGroupID == 39
+                                   select pg).List();
+                    foreach (var gr in kitList)
+                    {
+                        foreach (var it in kitmod)
+                        {
+
+                            session.Save(new ProductGroupModifier() { ProductGroup = gr, Modifier = it, ShowAutomatically = false });
+                        }
+                    }
+                    #endregion
+
+                    #region drinks
+                    var otherdri = (from pg in session.QueryOver<Modifier>()
+                                    where pg.ModifierID <= 16
+                                    select pg).List<Modifier>();
+                    var barList = (from pg in session.QueryOver<ProductGroup>()
+                                   where pg.ProductGroupID == 3 || pg.ProductGroupID == 4 ||
+                                   pg.ProductGroupID == 5 || pg.ProductGroupID == 6 ||
+                                   pg.ProductGroupID == 7 || pg.ProductGroupID == 8 ||
+                                   pg.ProductGroupID == 9 || pg.ProductGroupID == 10 ||
+                                   pg.ProductGroupID == 11 || pg.ProductGroupID == 12 ||
+                                   pg.ProductGroupID == 13 || pg.ProductGroupID == 14 ||
+                                   pg.ProductGroupID == 15 || pg.ProductGroupID == 16 ||
+                                   pg.ProductGroupID == 17 || pg.ProductGroupID == 18 ||
+                                   pg.ProductGroupID == 19 || pg.ProductGroupID == 20 ||
+                                   pg.ProductGroupID == 21 || pg.ProductGroupID == 33 ||
+                                   pg.ProductGroupID == 34 || pg.ProductGroupID == 35 ||
+                                   pg.ProductGroupID == 36 || pg.ProductGroupID == 37 ||
+                                   pg.ProductGroupID == 18
+                                   select pg).List();
+
+
+                    foreach (var gr in barList)
+                    {
+                        foreach (var it in otherdri)
+                        {
+
+                            session.Save(new ProductGroupModifier() { ProductGroup = gr, Modifier = it, ShowAutomatically = false });
+                        }
+                    }
+                    #endregion
                     trans.Commit();
                 }
             }
diff --git a/Tanshu.Accounts.SqlDAO/Fluent/NotNullConvention.cs b/Tanshu.Accounts.SqlDAO/Fluent/NotNullConvention.cs
new file mode 100644
index 0000000..58dda6e
--- /dev/null
+++ b/Tanshu.Accounts.SqlDAO/Fluent/NotNullConvention.cs
@@ -0,0 +1,24 @@
+using System;
+using FluentNHibernate.Conventions;
+using System.Reflection;
+using FluentNHibernate;
+using FluentNHibernate.Conventions.Instances;
+using FluentNHibernate.Conventions.Inspections;
+using FluentNHibernate.Conventions.AcceptanceCriteria;
+using Tanshu.Accounts.Contracts;
+
+namespace Tanshu.Accounts.Conventions
+{
+    public class NotNullConvention : IPropertyConvention
+    {
+        public void Apply(IPropertyInstance instance)
+        {
+            if (!HasAttribute(instance.Property.MemberInfo)) return;
+            instance.Not.Nullable();
+        }
+        bool HasAttribute(ICustomAttributeProvider provider)
+        {
+            return provider.GetCustomAttributes(typeof(NotNullAttribute), false).Length == 1;
+        }
+    }
+}
diff --git a/Tanshu.Accounts.SqlDAO/Fluent/SetupStore.cs b/Tanshu.Accounts.SqlDAO/Fluent/SetupStore.cs
index 5d4fcac..2b90e44 100644
--- a/Tanshu.Accounts.SqlDAO/Fluent/SetupStore.cs
+++ b/Tanshu.Accounts.SqlDAO/Fluent/SetupStore.cs
@@ -1,19 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using FluentNHibernate.Automapping;
-using Tanshu.Accounts.Contracts;
+using FluentNHibernate.Automapping;
 using FluentNHibernate.Cfg;
 using FluentNHibernate.Cfg.Db;
-using Tanshu.Accounts.Conventions;
-using Tanshu.Accounts.Entities;
-using NHibernate.Tool.hbm2ddl;
 using NHibernate;
 using NHibernate.Cfg;
-using FluentNHibernate.Conventions.Helpers;
+using Tanshu.Accounts.Conventions;
+using Tanshu.Accounts.Entities;
+using Tanshu.Accounts.SqlDAO;
 
-namespace Tanshu.Accounts.SqlDAO
+namespace Tanshu.Accounts.Repository
 {
     public sealed class SessionManager
     {
@@ -33,6 +27,10 @@ namespace Tanshu.Accounts.SqlDAO
         {
             get { return Nested.sessionManager.GetSession(); }
         }
+        public static IStatelessSession StatelessSession
+        {
+            get { return Nested.sessionManager.GetStatelessSession(); }
+        }
         public static Configuration Configuration
         {
             get { return Nested.sessionManager.GetConfiguration(); }
@@ -52,7 +50,9 @@ namespace Tanshu.Accounts.SqlDAO
                     c.Add<PrimaryKeyConvention>();
                     c.Add<CustomForeignKeyConvention>();
                     c.Add<ClassConvention>();
-                    c.Add(DefaultLazy.Never());
+                    c.Add<CascadeConvention>();
+                    c.Add<NotNullConvention>();
+                    //c.Add(DefaultLazy.Never());
                     //c.Add<EnumConvention>();
                 });
 
@@ -66,5 +66,9 @@ namespace Tanshu.Accounts.SqlDAO
         {
             return factory.OpenSession();
         }
+        public IStatelessSession GetStatelessSession()
+        {
+            return factory.OpenStatelessSession();
+        }
     }
 }
\ No newline at end of file
diff --git a/Tanshu.Accounts.SqlDAO/Fluent/StoreConfiguration.cs b/Tanshu.Accounts.SqlDAO/Fluent/StoreConfiguration.cs
index 569e4c8..c1ec89d 100644
--- a/Tanshu.Accounts.SqlDAO/Fluent/StoreConfiguration.cs
+++ b/Tanshu.Accounts.SqlDAO/Fluent/StoreConfiguration.cs
@@ -1,12 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Diagnostics;
-using Tanshu.Data.DAO;
-using FluentNHibernate.Automapping;
 using FluentNHibernate;
+using FluentNHibernate.Automapping;
 
-namespace Tanshu.Accounts.SqlDAO
+namespace Tanshu.Accounts.Repository
 {
     public class StoreConfiguration : DefaultAutomappingConfiguration
     {
diff --git a/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.Repository.csproj b/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.Repository.csproj
index 44c2fe5..23302b2 100644
--- a/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.Repository.csproj
+++ b/Tanshu.Accounts.SqlDAO/Tanshu.Accounts.Repository.csproj
@@ -94,6 +94,8 @@
     <Compile Include="BusinessLayer\CheckoutBI.cs" />
     <Compile Include="BusinessLayer\SettleOptionBI.cs" />
     <Compile Include="BusinessLayer\ManagementBI.cs" />
+    <Compile Include="Fluent\CascadeConvention.cs" />
+    <Compile Include="Fluent\NotNullConvention.cs" />
     <Compile Include="Fluent\SettleOptionFactory.cs" />
     <Compile Include="Fluent\EnumConvention.cs" />
     <Compile Include="Fluent\QueryStore.cs" />
diff --git a/Tanshu.Accounts.sln b/Tanshu.Accounts.sln
index 55c68b8..20402be 100644
--- a/Tanshu.Accounts.sln
+++ b/Tanshu.Accounts.sln
@@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tanshu.Accounts.Print", "Ta
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tanshu.Accounts.Repository", "Tanshu.Accounts.SqlDAO\Tanshu.Accounts.Repository.csproj", "{B755D152-37C3-47D6-A721-3AD17A8EF316}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tanshu.Common.KeyboardControl", "Tanshu.Common.KeyboardControl\Tanshu.Common.KeyboardControl.csproj", "{4847FEE9-90E1-4795-A644-32867887A653}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,10 +37,6 @@ Global
 		{B755D152-37C3-47D6-A721-3AD17A8EF316}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B755D152-37C3-47D6-A721-3AD17A8EF316}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B755D152-37C3-47D6-A721-3AD17A8EF316}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4847FEE9-90E1-4795-A644-32867887A653}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4847FEE9-90E1-4795-A644-32867887A653}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4847FEE9-90E1-4795-A644-32867887A653}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4847FEE9-90E1-4795-A644-32867887A653}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Tanshu.Common.KeyboardControl/NumpadControl.Designer.cs b/Tanshu.Common.KeyboardControl/NumpadControl.Designer.cs
deleted file mode 100644
index de3abd3..0000000
--- a/Tanshu.Common.KeyboardControl/NumpadControl.Designer.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-namespace Tanshu.Common.KeyboardControl
-{
-    partial class NumpadControl
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.btn7 = new UnselectableButton();
-            this.btn5 = new UnselectableButton();
-            this.btn4 = new UnselectableButton();
-            this.btn6 = new UnselectableButton();
-            this.btn2 = new UnselectableButton();
-            this.btn1 = new UnselectableButton();
-            this.btn3 = new UnselectableButton();
-            this.btn0 = new UnselectableButton();
-            this.btnOk = new UnselectableButton();
-            this.btnDot = new UnselectableButton();
-            this.btnDel = new UnselectableButton();
-            this.btn8 = new UnselectableButton();
-            this.btn9 = new UnselectableButton();
-            this.btnEsc = new UnselectableButton();
-            this.SuspendLayout();
-            // 
-            // btn7
-            // 
-            this.btn7.Location = new System.Drawing.Point(3, 3);
-            this.btn7.Name = "btn7";
-            this.btn7.Size = new System.Drawing.Size(50, 50);
-            this.btn7.TabIndex = 0;
-            this.btn7.TabStop = false;
-            this.btn7.Text = "7";
-            this.btn7.UseVisualStyleBackColor = true;
-            this.btn7.Click += new System.EventHandler(this.btn7_Click);
-            // 
-            // btn5
-            // 
-            this.btn5.Location = new System.Drawing.Point(59, 59);
-            this.btn5.Name = "btn5";
-            this.btn5.Size = new System.Drawing.Size(50, 50);
-            this.btn5.TabIndex = 1;
-            this.btn5.TabStop = false;
-            this.btn5.Text = "5";
-            this.btn5.UseVisualStyleBackColor = true;
-            this.btn5.Click += new System.EventHandler(this.btn5_Click);
-            // 
-            // btn4
-            // 
-            this.btn4.Location = new System.Drawing.Point(3, 59);
-            this.btn4.Name = "btn4";
-            this.btn4.Size = new System.Drawing.Size(50, 50);
-            this.btn4.TabIndex = 2;
-            this.btn4.TabStop = false;
-            this.btn4.Text = "4";
-            this.btn4.UseVisualStyleBackColor = true;
-            this.btn4.Click += new System.EventHandler(this.btn4_Click);
-            // 
-            // btn6
-            // 
-            this.btn6.Location = new System.Drawing.Point(115, 59);
-            this.btn6.Name = "btn6";
-            this.btn6.Size = new System.Drawing.Size(50, 50);
-            this.btn6.TabIndex = 3;
-            this.btn6.TabStop = false;
-            this.btn6.Text = "6";
-            this.btn6.UseVisualStyleBackColor = true;
-            this.btn6.Click += new System.EventHandler(this.btn6_Click);
-            // 
-            // btn2
-            // 
-            this.btn2.Location = new System.Drawing.Point(59, 115);
-            this.btn2.Name = "btn2";
-            this.btn2.Size = new System.Drawing.Size(50, 50);
-            this.btn2.TabIndex = 4;
-            this.btn2.TabStop = false;
-            this.btn2.Text = "2";
-            this.btn2.UseVisualStyleBackColor = true;
-            this.btn2.Click += new System.EventHandler(this.btn2_Click);
-            // 
-            // btn1
-            // 
-            this.btn1.Location = new System.Drawing.Point(3, 115);
-            this.btn1.Name = "btn1";
-            this.btn1.Size = new System.Drawing.Size(50, 50);
-            this.btn1.TabIndex = 5;
-            this.btn1.TabStop = false;
-            this.btn1.Text = "1";
-            this.btn1.UseVisualStyleBackColor = true;
-            this.btn1.Click += new System.EventHandler(this.btn1_Click);
-            // 
-            // btn3
-            // 
-            this.btn3.Location = new System.Drawing.Point(115, 115);
-            this.btn3.Name = "btn3";
-            this.btn3.Size = new System.Drawing.Size(50, 50);
-            this.btn3.TabIndex = 6;
-            this.btn3.TabStop = false;
-            this.btn3.Text = "3";
-            this.btn3.UseVisualStyleBackColor = true;
-            this.btn3.Click += new System.EventHandler(this.btn3_Click);
-            // 
-            // btn0
-            // 
-            this.btn0.Location = new System.Drawing.Point(3, 171);
-            this.btn0.Name = "btn0";
-            this.btn0.Size = new System.Drawing.Size(106, 50);
-            this.btn0.TabIndex = 7;
-            this.btn0.TabStop = false;
-            this.btn0.Text = "0";
-            this.btn0.UseVisualStyleBackColor = true;
-            this.btn0.Click += new System.EventHandler(this.btn0_Click);
-            // 
-            // btnOk
-            // 
-            this.btnOk.Location = new System.Drawing.Point(171, 115);
-            this.btnOk.Name = "btnOk";
-            this.btnOk.Size = new System.Drawing.Size(50, 106);
-            this.btnOk.TabIndex = 8;
-            this.btnOk.TabStop = false;
-            this.btnOk.Text = "OK";
-            this.btnOk.UseVisualStyleBackColor = true;
-            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
-            // 
-            // btnDot
-            // 
-            this.btnDot.Location = new System.Drawing.Point(115, 171);
-            this.btnDot.Name = "btnDot";
-            this.btnDot.Size = new System.Drawing.Size(50, 50);
-            this.btnDot.TabIndex = 9;
-            this.btnDot.TabStop = false;
-            this.btnDot.Text = ".";
-            this.btnDot.UseVisualStyleBackColor = true;
-            this.btnDot.Click += new System.EventHandler(this.btnDot_Click);
-            // 
-            // btnDel
-            // 
-            this.btnDel.Location = new System.Drawing.Point(171, 59);
-            this.btnDel.Name = "btnDel";
-            this.btnDel.Size = new System.Drawing.Size(50, 50);
-            this.btnDel.TabIndex = 10;
-            this.btnDel.TabStop = false;
-            this.btnDel.Text = "Del";
-            this.btnDel.UseVisualStyleBackColor = true;
-            this.btnDel.Click += new System.EventHandler(this.btnDel_Click);
-            // 
-            // btn8
-            // 
-            this.btn8.Location = new System.Drawing.Point(59, 3);
-            this.btn8.Name = "btn8";
-            this.btn8.Size = new System.Drawing.Size(50, 50);
-            this.btn8.TabIndex = 11;
-            this.btn8.TabStop = false;
-            this.btn8.Text = "8";
-            this.btn8.UseVisualStyleBackColor = true;
-            this.btn8.Click += new System.EventHandler(this.btn8_Click);
-            // 
-            // btn9
-            // 
-            this.btn9.Location = new System.Drawing.Point(115, 3);
-            this.btn9.Name = "btn9";
-            this.btn9.Size = new System.Drawing.Size(50, 50);
-            this.btn9.TabIndex = 12;
-            this.btn9.TabStop = false;
-            this.btn9.Text = "9";
-            this.btn9.UseVisualStyleBackColor = true;
-            this.btn9.Click += new System.EventHandler(this.btn9_Click);
-            // 
-            // btnEsc
-            // 
-            this.btnEsc.Location = new System.Drawing.Point(171, 3);
-            this.btnEsc.Name = "btnEsc";
-            this.btnEsc.Size = new System.Drawing.Size(50, 50);
-            this.btnEsc.TabIndex = 13;
-            this.btnEsc.TabStop = false;
-            this.btnEsc.Text = "Esc";
-            this.btnEsc.UseVisualStyleBackColor = true;
-            this.btnEsc.Click += new System.EventHandler(this.btnEsc_Click);
-            // 
-            // NumpadControl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.btnEsc);
-            this.Controls.Add(this.btn9);
-            this.Controls.Add(this.btn8);
-            this.Controls.Add(this.btnDel);
-            this.Controls.Add(this.btnDot);
-            this.Controls.Add(this.btnOk);
-            this.Controls.Add(this.btn0);
-            this.Controls.Add(this.btn3);
-            this.Controls.Add(this.btn1);
-            this.Controls.Add(this.btn2);
-            this.Controls.Add(this.btn6);
-            this.Controls.Add(this.btn4);
-            this.Controls.Add(this.btn5);
-            this.Controls.Add(this.btn7);
-            this.Name = "NumpadControl";
-            this.Size = new System.Drawing.Size(224, 224);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private UnselectableButton btn7;
-        private UnselectableButton btn5;
-        private UnselectableButton btn4;
-        private UnselectableButton btn6;
-        private UnselectableButton btn2;
-        private UnselectableButton btn1;
-        private UnselectableButton btn3;
-        private UnselectableButton btn0;
-        private UnselectableButton btnOk;
-        private UnselectableButton btnDot;
-        private UnselectableButton btnDel;
-        private UnselectableButton btn8;
-        private UnselectableButton btn9;
-        private UnselectableButton btnEsc;
-    }
-}
diff --git a/Tanshu.Common.KeyboardControl/NumpadControl.cs b/Tanshu.Common.KeyboardControl/NumpadControl.cs
deleted file mode 100644
index 47dfb78..0000000
--- a/Tanshu.Common.KeyboardControl/NumpadControl.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace Tanshu.Common.KeyboardControl
-{
-    public partial class NumpadControl : UserControl
-    {
-        public NumpadControl()
-        {
-            InitializeComponent();
-        }
-
-        private void btn1_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("1");
-        }
-
-        private void btn2_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("2");
-        }
-
-        private void btn3_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("3");
-        }
-
-        private void btn4_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("4");
-        }
-
-        private void btn5_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("5");
-        }
-
-        private void btn6_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("6");
-        }
-
-        private void btn7_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("7");
-        }
-
-        private void btn8_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("8");
-        }
-
-        private void btn9_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("9");
-        }
-
-        private void btn0_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("0");
-        }
-
-        private void btnDot_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send(".");
-        }
-
-        private void btnOk_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("{ENTER}");
-        }
-
-        private void btnDel_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("{BACKSPACE}");
-        }
-
-        private void btnEsc_Click(object sender, EventArgs e)
-        {
-            SendKeys.Send("{ESC}");
-        }
-    }
-}
diff --git a/Tanshu.Common.KeyboardControl/Properties/AssemblyInfo.cs b/Tanshu.Common.KeyboardControl/Properties/AssemblyInfo.cs
deleted file mode 100644
index df65bae..0000000
--- a/Tanshu.Common.KeyboardControl/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Tanshu.Common.KeyboardControl")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Tanshu.Common.KeyboardControl")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("edbf868e-779b-4243-8cb9-150384a94bcc")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Tanshu.Common.KeyboardControl/Tanshu.Common.KeyboardControl.csproj b/Tanshu.Common.KeyboardControl/Tanshu.Common.KeyboardControl.csproj
deleted file mode 100644
index 5529246..0000000
--- a/Tanshu.Common.KeyboardControl/Tanshu.Common.KeyboardControl.csproj
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4847FEE9-90E1-4795-A644-32867887A653}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tanshu.Common.KeyboardControl</RootNamespace>
-    <AssemblyName>Tanshu.Common.KeyboardControl</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\Bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\Bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="NumpadControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="NumpadControl.Designer.cs">
-      <DependentUpon>NumpadControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UnselectableButton.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="UnselectableButton.Designer.cs">
-      <DependentUpon>UnselectableButton.cs</DependentUpon>
-    </Compile>
-    <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="NumpadControl.resx">
-      <DependentUpon>NumpadControl.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Tanshu.Common.KeyboardControl/UnselectableButton.Designer.cs b/Tanshu.Common.KeyboardControl/UnselectableButton.Designer.cs
deleted file mode 100644
index df9ec22..0000000
--- a/Tanshu.Common.KeyboardControl/UnselectableButton.Designer.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-namespace Tanshu.Common.KeyboardControl
-{
-    partial class UnselectableButton
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            components = new System.ComponentModel.Container();
-        }
-
-        #endregion
-    }
-}
diff --git a/Tanshu.Common.KeyboardControl/UnselectableButton.cs b/Tanshu.Common.KeyboardControl/UnselectableButton.cs
deleted file mode 100644
index 9df9e6b..0000000
--- a/Tanshu.Common.KeyboardControl/UnselectableButton.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace Tanshu.Common.KeyboardControl
-{
-    public partial class UnselectableButton : Button
-    {
-        public UnselectableButton()
-        {
-            InitializeComponent();
-
-            this.SetStyle(ControlStyles.Selectable, false);
-        }
-    }
-}