Updating for new django..more updates coming..