Hard written basic functionality finished
Changed to use generic view