Updated Circular Buffer to be struct based