Finishing up Controller