Done. Test a little more but it's good.