Refactored to a more django admin friendly package