VID-488 Base functionality working

Now need to get UX and UI working better