All functions added. Tests fine.