Added More Named Queries
functional, will do css later