Refactored into more MVC-like views. State in hash, views found django style