Starting over to some extent with a slightly different structure, just have the basequery and some other basics done for now