All functionality in place

Works just need to style now