Finishing up
Added match controller