giraffe stuff. moving into giraffe branch now