More functions, need to come back to this at a later time.