merged my functions into kirbys class