Adding in remaining functions