Adding geddy code