Changes to queue.c

Changed and added MACROS to queues, system still not ready for
deployment