Adding further garage functionality