added TODOs
added django template