More view implementation
Added match generation