Almost completed the draft controller