Ismail completed #18

Ismail has implemented the enhancements for #18. Be sure to run on DB with the new fields, or check that syncdb adds them if you haven't added them with SQL.