Initial finish of first attempt

I have added all the features I wanted and cleaned it up. Search is not
working yet, but I will keep trying
Messing about with the Search function. Not working now.