Edit Controller, View and Models for new functionality